From be753d7a1a34c6f4027bf630ed2af9c0eab76ef7 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 28 Jul 2013 12:52:41 +0000 Subject: [PATCH] * Addresses: Treat RFC 4193 addresses fc00::/7 as local --- core/java/src/net/i2p/util/Addresses.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java index fec88eda8..77e4759fa 100644 --- 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