From ab7e4286242b2a1615b27cecf7b078b77b3a0a59 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 9 May 2020 19:37:28 +0000 Subject: [PATCH] GeoIP: Add to CLI --- router/java/src/net/i2p/router/CommandLine.java | 1 + .../java/src/net/i2p/router/transport/GeoIP.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/CommandLine.java b/router/java/src/net/i2p/router/CommandLine.java index 3641f18087..65c789e412 100644 --- a/router/java/src/net/i2p/router/CommandLine.java +++ b/router/java/src/net/i2p/router/CommandLine.java @@ -26,6 +26,7 @@ public class CommandLine extends net.i2p.util.CommandLine { "net.i2p.router.peermanager.ProfileOrganizer", "net.i2p.router.tasks.CryptoChecker", "net.i2p.router.time.NtpClient", + "net.i2p.router.transport.GeoIP", "net.i2p.router.transport.GeoIPv6", "net.i2p.router.transport.udp.MTU", "net.i2p.router.transport.UPnP" diff --git a/router/java/src/net/i2p/router/transport/GeoIP.java b/router/java/src/net/i2p/router/transport/GeoIP.java index 493fa73e2b..8aac53b33e 100644 --- a/router/java/src/net/i2p/router/transport/GeoIP.java +++ b/router/java/src/net/i2p/router/transport/GeoIP.java @@ -718,9 +718,13 @@ public class GeoIP { return _codeToName.get(code); } -/*** public static void main(String args[]) { + if (args.length <= 0) { + System.out.println("Usage: GeoIP ip..."); + System.exit(1); + } GeoIP g = new GeoIP(I2PAppContext.getGlobalContext()); +/*** String tests[] = {"0.0.0.0", "0.0.0.1", "0.0.0.2", "0.0.0.255", "1.0.0.0", "94.3.3.3", "77.1.2.3", "127.0.0.0", "127.127.127.127", "128.0.0.0", "89.8.9.3", "72.5.6.8", "217.4.9.7", "175.107.027.107", "135.6.5.2", @@ -730,12 +734,17 @@ public class GeoIP { }; for (int i = 0; i < tests.length; i++) g.add(tests[i]); +***/ + for (int i = 0; i < args.length; i++) + g.add(args[i]); long start = System.currentTimeMillis(); g.blockingLookup(); System.out.println("Lookup took " + (System.currentTimeMillis() - start)); +/*** for (int i = 0; i < tests.length; i++) System.out.println(tests[i] + " : " + g.get(tests[i])); - - } ***/ + for (int i = 0; i < args.length; i++) + System.out.println(args[i] + " : " + g.get(args[i])); + } }