Changeset 19faa35

Timestamp:

Jul 25, 2013 6:52:45 PM (7 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b2d72f9

Parents:

ffda7f63

Message:

• Transports:
  • Prefer IPv6 by default
  • Fix IPv6-only option
  • Don't try NTCP IPv6 addresses unless we have one
  • Fix non-%16 SSU padding in data and session confirmed packets; enable by default
  • Log tweaks

Files:

• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)
• router/java/src/net/i2p/router/transport/TransportImpl.java (modified) (3 diffs)
• router/java/src/net/i2p/router/transport/TransportUtil.java (modified) (2 diffs)
• router/java/src/net/i2p/router/transport/ntcp/EventPumper.java (modified) (3 diffs)
• router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java (modified) (4 diffs)
• router/java/src/net/i2p/router/transport/udp/PacketBuilder.java (modified) (6 diffs)

history.txt

@@ +1 @@
+2012-07-25 zzz
+ * Transports:
+   - Prefer IPv6 by default
+   - Fix IPv6-only option
+   - Don't try NTCP IPv6 addresses unless we have one
+   - Fix non-%16 SSU padding; enable by default
+ * Tunnels:
+   - Make expl. default 3 hops  (ticket #966)
+   - Allow expl. fallback up to -2 hops
+
 2012-07-24 zzz
  * GeoIP: Fix lookups, broken in IPv6 branch

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */

router/java/src/net/i2p/router/transport/TransportImpl.java

@@ -244 +244 @@
             msg.transportFailed(getStyle());
 
-        if (msToSend > 1000) {
-            if (_log.shouldLog(Log.WARN))
+        if (msToSend > 1500) {
+            if (_log.shouldLog(Log.INFO))
                 _log.warn(getStyle() + " afterSend slow: " + (sendSuccessful ? "success " : "FAIL ")
                           + msg.getMessageSize() + " byte "
@@ -578 +578 @@
     protected List<RouterAddress> getTargetAddresses(RouterInfo target) {
         List<RouterAddress> rv = target.getTargetAddresses(getStyle());
+        if (rv.isEmpty())
+            return rv;
         // Shuffle so everybody doesn't use the first one
-        if (rv.size() > 1) {
+        if (rv.size() > 1)
             Collections.shuffle(rv, _context.random());
-            TransportUtil.IPv6Config config = getIPv6Config();
-            int adj;
-            switch (config) {
+        TransportUtil.IPv6Config config = getIPv6Config();
+        int adj;
+        switch (config) {
               case IPV6_DISABLED:
-                adj = 10; break;
+                adj = 10;
+              /**** IPv6 addresses will be rejected in isPubliclyRoutable()
+                for (Iterator<RouterAddress> iter = rv.iterator(); iter.hasNext(); ) {
+                    byte[] ip = iter.next().getIP();
+                    if (ip != null && ip.length == 16)
+                        iter.remove();
+                }
+               ****/
+                break;
               case IPV6_NOT_PREFERRED:
                 adj = 1; break;
@@ -594 +604 @@
                 adj = -1; break;
               case IPV6_ONLY:
-                adj = -10; break;
-            }
+                adj = -10;
+                // IPv4 addresses not rejected in isPubliclyRoutable()
+                for (Iterator<RouterAddress> iter = rv.iterator(); iter.hasNext(); ) {
+                    byte[] ip = iter.next().getIP();
+                    if (ip != null && ip.length == 4)
+                        iter.remove();
+                }
+                break;
+        }
+        if (rv.size() > 1)
             Collections.sort(rv, new AddrComparator(adj));
-        }
         return rv;
     }

router/java/src/net/i2p/router/transport/TransportUtil.java

@@ -53 +53 @@
 
     private static final Map<String, IPv6Config> BY_NAME = new HashMap<String, IPv6Config>();
-    public static final IPv6Config DEFAULT_IPV6_CONFIG = IPv6Config.IPV6_DISABLED;
+    public static final IPv6Config DEFAULT_IPV6_CONFIG = IPv6Config.IPV6_PREFERRED;
 
     static {
@@ -61 +61 @@
         // alias
         BY_NAME.put("true", IPv6Config.IPV6_ENABLED);
+        BY_NAME.put("disable", IPv6Config.IPV6_DISABLED);
     }
 

router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

@@ -26 +26 @@
 import net.i2p.router.RouterContext;
 import net.i2p.router.transport.FIFOBandwidthLimiter;
+import net.i2p.util.Addresses;
 import net.i2p.util.ConcurrentHashSet;
 import net.i2p.util.I2PThread;
@@ -782 +783 @@
                 key.attach(con);
                 con.setKey(key);
+                RouterAddress naddr = con.getRemoteAddress();
                 try {
-                    RouterAddress naddr = con.getRemoteAddress();
                     if (naddr.getPort() <= 0)
                         throw new IOException("Invalid NTCP address: " + naddr);
@@ -795 +796 @@
                     }
                 } catch (IOException ioe) {
-                    if (_log.shouldLog(Log.WARN)) _log.warn("error connecting", ioe);
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("error connecting to " + Addresses.toString(naddr.getIP(), naddr.getPort()), ioe);
                     _context.statManager().addRateData("ntcp.connectFailedIOE", 1);
                     _transport.markUnreachable(con.getRemotePeer().calculateHash());

router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

@@ -72 +72 @@
      */
     private final Set<NTCPConnection> _establishing;
+
+    /**
+     *  Do we have a public IPv6 address?
+     *  TODO periodically update via CSFI.NetMonitor?
+     */
+    private boolean _haveIPv6Address;
 
     public final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname";
@@ -365 +371 @@
                 continue;
             }
-            if (!isPubliclyRoutable(ip)) {
+            if (!isValid(ip)) {
                 if (! _context.getBooleanProperty("i2np.ntcp.allowLocal")) {
                     //_context.statManager().addRateData("ntcp.bidRejectedLocalAddress", 1);
@@ -376 +382 @@
         }
         return null;
+    }
+    
+    /**
+     * An IPv6 address is only valid if we are configured to support IPv6
+     * AND we have a public IPv6 address.
+     *
+     * @param addr may be null, returns false
+     * @since 0.9.8
+     */
+    private boolean isValid(byte addr[]) {
+        if (addr == null) return false;
+        if (isPubliclyRoutable(addr) &&
+            (addr.length != 16 || _haveIPv6Address))
+            return true;
+        return false;
     }
 
@@ -810 +831 @@
         if (_log.shouldLog(Log.WARN))
             _log.warn("Received address: " + Addresses.toString(ip, port) + " from: " + source);
-        if (ip != null && !isPubliclyRoutable(ip)) {
+        if ((source == SOURCE_INTERFACE || source == SOURCE_SSU)
+             && ip != null && ip.length == 16) {
+            // must be set before isValid() call
+            _haveIPv6Address = true;
+        }
+        if (ip != null && !isValid(ip)) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Invalid address: " + Addresses.toString(ip, port) + " from: " + source);

router/java/src/net/i2p/router/transport/udp/PacketBuilder.java

@@ -162 +162 @@
 
     private static final String PROP_PADDING = "i2np.udp.padding";
+    private static final boolean DEFAULT_ENABLE_PADDING = true;
 
     /**
@@ -409 +410 @@
         // pad up so we're on the encryption boundary
         off = pad1(data, off);
-        off = pad2(data, off, currentMTU);
+        off = pad2(data, off, currentMTU - (ipHeaderSize + UDP_HEADER_SIZE));
         pkt.setLength(off);
 
@@ -783 +784 @@
                 off += paddingRequired;
             }
+            // We cannot have non-mod16 (pad2) padding here, since the signature
+            // is at the end. As of 0.9.7 we won't decrypt past the end of the packet
+            // so trailing non-mod-16 data is ignored. That truncates the sig.
             
             // BUG: NPE here if null signature
@@ -793 +797 @@
             // pad up so we're on the encryption boundary
             off = pad1(data, off);
+            // allowed but untested
+            //off = pad2(data, off);
         } 
-        off = pad2(data, off);
         pkt.setLength(off);
         authenticate(packet, state.getCipherKey(), state.getMACKey());
@@ -1352 +1357 @@
      */
     private int pad2(byte[] data, int off) {
-        if (!_context.getBooleanProperty(PROP_PADDING))
+        if (!_context.getProperty(PROP_PADDING, DEFAULT_ENABLE_PADDING))
             return off;
         int padSize = _context.random().nextInt(MAX_PAD2);
@@ -1371 +1376 @@
      */
     private int pad2(byte[] data, int off, int maxLen) {
-        if (!_context.getBooleanProperty(PROP_PADDING))
+        if (!_context.getProperty(PROP_PADDING, DEFAULT_ENABLE_PADDING))
             return off;
         if (off >= maxLen)