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

strip scope from returned address strings

Browse Source
This commit is contained in:
zzz
2013-05-12 15:23:02 +00:00
parent 1b38a6478b
commit 7318632db9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ public abstract class Addresses {
haveIPv6 = true; haveIPv6 = true;
if (shouldInclude(allMyIps[i], includeSiteLocal, if (shouldInclude(allMyIps[i], includeSiteLocal,
includeLoopbackAndWildcard, includeIPv6)) includeLoopbackAndWildcard, includeIPv6))
rv.add(allMyIps[i].getHostAddress()); rv.add(stripScope(allMyIps[i].getHostAddress()));
} }
} }
} catch (UnknownHostException e) {} } catch (UnknownHostException e) {}
@@ -113,7 +113,7 @@ public abstract class Addresses {
haveIPv6 = true; haveIPv6 = true;
if (shouldInclude(addr, includeSiteLocal, if (shouldInclude(addr, includeSiteLocal,
includeLoopbackAndWildcard, includeIPv6)) includeLoopbackAndWildcard, includeIPv6))
rv.add(addr.getHostAddress()); rv.add(stripScope(addr.getHostAddress()));
} }
} }
} }
@@ -128,6 +128,17 @@ public abstract class Addresses {
return rv; return rv;
} }
/**
* Strip the trailing "%nn" from Inet6Address.getHostAddress()
* @since IPv6
*/
private static String stripScope(String ip) {
int pct = ip.indexOf("%");
if (pct > 0)
ip = ip.substring(0, pct);
return ip;
}
private static boolean shouldInclude(InetAddress ia, boolean includeSiteLocal, private static boolean shouldInclude(InetAddress ia, boolean includeSiteLocal,
boolean includeLoopbackAndWildcard, boolean includeIPv6) { boolean includeLoopbackAndWildcard, boolean includeIPv6) {
return return