I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Addresses cleanup

Browse Source
This commit is contained in:
zzz
2010-12-26 22:57:13 +00:00
parent 443abce647
commit cdcbc80248
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,12 +55,18 @@ public abstract class Addresses {
* @since 0.8.3 * @since 0.8.3
*/ */
public static SortedSet<String> getAddresses(boolean includeLocal, boolean includeIPv6) { public static SortedSet<String> getAddresses(boolean includeLocal, boolean includeIPv6) {
boolean haveIPv4 = false;
boolean haveIPv6 = false;
SortedSet<String> rv = new TreeSet(); SortedSet<String> rv = new TreeSet();
try { try {
InetAddress localhost = InetAddress.getLocalHost(); InetAddress localhost = InetAddress.getLocalHost();
InetAddress[] allMyIps = InetAddress.getAllByName(localhost.getCanonicalHostName()); InetAddress[] allMyIps = InetAddress.getAllByName(localhost.getCanonicalHostName());
if (allMyIps != null) { if (allMyIps != null) {
for (int i = 0; i < allMyIps.length; i++) { for (int i = 0; i < allMyIps.length; i++) {
if (allMyIps[i] instanceof Inet4Address)
haveIPv4 = true;
else
haveIPv6 = true;
if (shouldInclude(allMyIps[i], includeLocal, includeIPv6)) if (shouldInclude(allMyIps[i], includeLocal, includeIPv6))
rv.add(allMyIps[i].getHostAddress()); rv.add(allMyIps[i].getHostAddress());
} }
@ -72,25 +78,20 @@ public abstract class Addresses {
NetworkInterface ifc = ifcs.nextElement(); NetworkInterface ifc = ifcs.nextElement();
for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) { for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) {
InetAddress addr = addrs.nextElement(); InetAddress addr = addrs.nextElement();
if (addr instanceof Inet4Address)
haveIPv4 = true;
else
haveIPv6 = true;
if (shouldInclude(addr, includeLocal, includeIPv6)) if (shouldInclude(addr, includeLocal, includeIPv6))
rv.add(addr.getHostAddress()); rv.add(addr.getHostAddress());
} }
} }
} catch (SocketException e) {} } catch (SocketException e) {}
if (includeLocal) if (includeLocal && haveIPv4)
rv.add("0.0.0.0"); rv.add("0.0.0.0");
if (includeLocal && includeIPv6) { if (includeLocal && includeIPv6 && haveIPv6)
boolean ipv6 = false; rv.add("0:0:0:0:0:0:0:0"); // we could do "::" but all the other ones are probably in long form
for (String a : rv) {
if (a.indexOf(':') >= 0) {
ipv6 = true;
break;
}
}
if (ipv6)
rv.add("0:0:0:0:0:0:0:0"); // we could do "::" but all the other ones are probably in long form
}
return rv; return rv;
} }