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

Util: Stub out yggdrasil address detection

Browse Source 
WIP - not hooked in
This commit is contained in:
zzz
2021-02-03 09:27:12 -05:00
parent 56fabe31e2
commit 8d60d68e23
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
router/java/src/net/i2p/router/transport/TransportUtil.java
View File

@@ -13,6 +13,7 @@ import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
import net.i2p.I2PAppContext;
import net.i2p.data.router.RouterAddress;
@@ -39,6 +40,8 @@ public abstract class TransportUtil {
private static final int MIN_RANDOM_PORT = 9151;
private static final int MAX_RANDOM_PORT = 30777;
private static final Pattern YGGDRASIL_PATTERN = Pattern.compile("^[2-3][0-9a-fA-F]{2}:[0-9a-fA-F:]*");
public enum IPv6Config {
/** IPv6 disabled */
IPV6_DISABLED("false"),
@@ -128,6 +131,15 @@ public abstract class TransportUtil {
return host != null && host.contains(":");
}
/**
* @since 0.9.49
*/
public static boolean isYggdrasil(RouterAddress addr) {
// do this the fast way, without calling getIP() to parse the host string
String host = addr.getHost();
return host != null && YGGDRASIL_PATTERN.matcher(host).matches();
}
/**
* @param addr non-null
* @since IPv6 moved from TransportImpl
@@ -290,4 +302,16 @@ public abstract class TransportUtil {
int maxPort = Math.min(65535, Math.max(minPort, ctx.getProperty(maxprop, MAX_RANDOM_PORT)));
return minPort + ctx.random().nextInt(1 + maxPort - minPort);
}
/*
public static void main(String[] args) {
java.util.Set<String> addrs = net.i2p.util.Addresses.getAddresses(true, true, true, true);
net.i2p.util.OrderedProperties props = new net.i2p.util.OrderedProperties();
RouterAddress ra = new RouterAddress("foo", props, 10);
for (String a : addrs) {
props.setProperty("host", a);
System.out.println(a + " - " + isYggdrasil(ra));
}
}
*/
}