AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Util: Improved classification of public/local IPv6 addresses

Browse Source
This commit is contained in:
zzz
2021-01-31 11:10:35 -05:00
parent 1c8614bc33
commit 0b4fe1aa56
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/src/net/i2p/util/Addresses.java
View File

@@ -273,8 +273,8 @@ public abstract class Addresses {
private static boolean shouldInclude(InetAddress ia, boolean includeSiteLocal,
boolean includeLoopbackAndWildcard, boolean includeIPv6) {
byte[] ip = ia.getAddress();
if (TEST_IPV6_ONLY) {
byte[] ip = ia.getAddress();
if (ip.length == 4) {
int i = ip[0] & 0xff;
if (i != 127 &&
@@ -294,8 +294,10 @@ public abstract class Addresses {
(includeSiteLocal ||
((!ia.isSiteLocalAddress()) &&
// disallow fc00::/8 and fd00::/8 (Unique local addresses RFC 4193)
// and yggdrasil
// not recognized as local by InetAddress
(ia.getAddress().length != 16 || (ia.getAddress()[0] & 0xfe) != 0xfc))) &&
(ip.length != 16 ||
((ip[0] & 0xff) >= 0x20 && (ip[0] & 0xff) <= 0x3f)))) &&
// Hamachi 5/8 allocated to RIPE (30 November 2010)
// Removed from TransportImpl.isPubliclyRoutable()
// Check moved to here, for now, but will eventually need to
@@ -303,7 +305,7 @@ public abstract class Addresses {
//(includeLocal ||
//(!ia.getHostAddress().startsWith("5."))) &&
(includeIPv6 ||
(ia instanceof Inet4Address));
ip.length == 4);
}
/**