Changeset c7d0526

Timestamp:

May 9, 2019 8:11:03 PM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

d8980d1

Parents:

de8a079

Message:

Transport: Start first GeoIP lookup when netdb is ready

Location:

router/java/src/net/i2p/router

Files:

• CommSystemFacade.java (modified) (1 diff)
• Router.java (modified) (1 diff)
• transport/CommSystemFacadeImpl.java (modified) (3 diffs)
• transport/GeoIP.java (modified) (10 diffs)

router/java/src/net/i2p/router/CommSystemFacade.java

@@ -184 +184 @@
      */
     public DHSessionKeyBuilder.Factory getDHFactory() { return null; }
+
+    /**
+     *  Router must call after netdb is initialized
+     *  @since 0.9.41
+     */
+    public void initGeoIP() {}
 
     /*

router/java/src/net/i2p/router/Router.java

@@ -876 +876 @@
             // but just to be safe
             _context.simpleTimer2().addEvent(r, 0);
+            _context.commSystem().initGeoIP();
         }
     }

router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

@@ -33 +33 @@
 import net.i2p.util.SimpleTimer;
 import net.i2p.util.SimpleTimer2;
+import net.i2p.util.SystemVersion;
 import net.i2p.util.Translate;
 
@@ -56 +57 @@
         _geoIP = new GeoIP(_context);
         _manager = new TransportManager(_context);
-        startGeoIP();
     }
     
@@ -364 +364 @@
      */
 
+    /**
+     *  Router must call after netdb is initialized
+     *  @since 0.9.41
+     */
+    @Override
+    public void initGeoIP() {
+        startGeoIP();
+    }
+
     /* We hope the routerinfos are read in and things have settled down by now, but it's not required to be so */
-    private static final int START_DELAY = 5*60*1000;
+    private static final int START_DELAY = SystemVersion.isSlow() ? 5*60*1000 : 5*1000;
     private static final int LOOKUP_TIME = 30*60*1000;
 

router/java/src/net/i2p/router/transport/GeoIP.java

@@ -127 +127 @@
      * Results will be added to the table and available via get() after completion.
      */
-    public void blockingLookup() {
+    void blockingLookup() {
         if (! _context.getBooleanPropertyDefaultTrue(PROP_GEOIP_ENABLED)) {
             _pendingSearch.clear();
@@ -154 +154 @@
             File geoip2 = getGeoIP2();
             DatabaseReader dbr = null;
+            long start = _context.clock().now();
             try {
                 // clear the negative cache every few runs, to prevent it from getting too big
@@ -296 +297 @@
                 _lock.set(false);
             }
+            if (_log.shouldInfo())
+                _log.info("GeoIP processing finished, time: " + (_context.clock().now() - start));
         }
     }
@@ -424 +427 @@
         String[] rv = new String[search.length];
         int idx = 0;
-        long start = _context.clock().now();
         BufferedReader br = null;
         try {
@@ -460 +462 @@
         }
 
-        if (_log.shouldLog(Log.INFO)) {
-            _log.info("GeoIP processing finished, time: " + (_context.clock().now() - start));
-        }
         return rv;
     }
@@ -500 +499 @@
      * @param ip IPv4 or IPv6
      */
-    public void add(String ip) {
+    void add(String ip) {
         byte[] pib = Addresses.getIP(ip);
         if (pib == null) return;
@@ -510 +509 @@
      * @param ip IPv4 or IPv6
      */
-    public void add(byte ip[]) {
+    void add(byte ip[]) {
         add(toLong(ip));
     }
@@ -530 +529 @@
      * @return lower-case code, generally two letters, or null.
      */
-    public String get(String ip) {
+    String get(String ip) {
         byte[] pib = Addresses.getIP(ip);
         if (pib == null) return null;
@@ -541 +540 @@
      * @return lower-case code, generally two letters, or null.
      */
-    public String get(byte ip[]) {
+    String get(byte ip[]) {
         return get(toLong(ip));
     }
@@ -598 +597 @@
      * @return untranslated name or null
      */
-    public String fullName(String code) {
+    String fullName(String code) {
         return _codeToName.get(code);
     }