* Addresses: Treat RFC 4193 addresses fc00::/7 as local

2013-07-28 12:52:41 +00:00
parent e3f02553fd
commit be753d7a1a
1 changed files with 4 additions and 1 deletions
--- a/core/java/src/net/i2p/util/Addresses.java
+++ b/core/java/src/net/i2p/util/Addresses.java
@@ -148,7 +148,10 @@ public abstract class Addresses {
             ((!ia.isAnyLocalAddress()) &&
              (!ia.isLoopbackAddress()))) &&
            (includeSiteLocal ||
-              !ia.isSiteLocalAddress()) &&
+             ((!ia.isSiteLocalAddress()) &&
+              // disallow fc00::/8 and fd00::/8 (Unique local addresses RFC 4193)
+              // not recognized as local by InetAddress
+              (ia.getAddress().length != 16 || (ia.getAddress()[0] & 0xfe) != 0xfc))) &&
            // Hamachi 5/8 allocated to RIPE (30 November 2010)
            // Removed from TransportImpl.isPubliclyRoutable()
            // Check moved to here, for now, but will eventually need to