Changeset 3846e08

Timestamp:

Dec 22, 2016 12:46:38 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

63a2a6d

Parents:

e625e67b

Message:

Router: More efficiently check blocklist when receiving new RI

Location:

router/java/src/net/i2p/router

Files:

• Blocklist.java (modified) (4 diffs)
• networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java (modified) (2 diffs)

router/java/src/net/i2p/router/Blocklist.java

@@ -80 +80 @@
     // temp
     private Map<Hash, String> _peerBlocklist = new HashMap<Hash, String>(4);
+    
+    private static final String PROP_BLOCKLIST_ENABLED = "router.blocklist.enable";
+    private static final String PROP_BLOCKLIST_DETAIL = "router.blocklist.detail";
+    private static final String PROP_BLOCKLIST_FILE = "router.blocklist.file";
+    private static final String BLOCKLIST_FILE_DEFAULT = "blocklist.txt";
+    private static final String BLOCKLIST_FEED_FILE = "docs/feed/blocklist/blocklist.txt";
 
     /**
@@ -106 +112 @@
         _blocklistFeedFile = new File(BLOCKLIST_FEED_FILE);
     }
-    
-    private static final String PROP_BLOCKLIST_ENABLED = "router.blocklist.enable";
-    private static final String PROP_BLOCKLIST_DETAIL = "router.blocklist.detail";
-    private static final String PROP_BLOCKLIST_FILE = "router.blocklist.file";
-    private static final String BLOCKLIST_FILE_DEFAULT = "blocklist.txt";
-    private static final String BLOCKLIST_FEED_FILE = "docs/feed/blocklist/blocklist.txt";
 
     /**
@@ -657 +657 @@
         if (pinfo == null)
             return Collections.emptyList();
+        return getAddresses(pinfo);
+    }
+
+    /**
+     * Will not contain duplicates.
+     * @since 0.9.29
+     */
+    private static List<byte[]> getAddresses(RouterInfo pinfo) {
         List<byte[]> rv = new ArrayList<byte[]>(4);
         // for each peer address
@@ -686 +694 @@
         for (byte[] ip : ips) {
             if (isBlocklisted(ip)) {
+                if (! _context.banlist().isBanlisted(peer))
+                    // nice knowing you...
+                    banlist(peer, ip);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Does the peer's IP address appear in the blocklist?
+     * If so, and it isn't banlisted, banlist it forever...
+     * @since 0.9.29
+     */
+    public boolean isBlocklisted(RouterInfo pinfo) {
+        List<byte[]> ips = getAddresses(pinfo);
+        if (ips.isEmpty())
+            return false;
+        for (byte[] ip : ips) {
+            if (isBlocklisted(ip)) {
+                Hash peer = pinfo.getHash();
                 if (! _context.banlist().isBanlisted(peer))
                     // nice knowing you...

router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java

@@ -161 +161 @@
                     if (prevNetDb == null) {
                         if ((!getContext().banlist().isBanlistedForever(key)) &&
-                            getContext().blocklist().isBlocklisted(key) &&
+                            getContext().blocklist().isBlocklisted(ri) &&
                             _log.shouldLog(Log.WARN))
                                 _log.warn("Blocklisting new peer " + key + ' ' + ri);
@@ -169 +169 @@
                         if ((!newAddr.equals(oldAddr)) &&
                             (!getContext().banlist().isBanlistedForever(key)) &&
-                            getContext().blocklist().isBlocklisted(key) &&
+                            getContext().blocklist().isBlocklisted(ri) &&
                             _log.shouldLog(Log.WARN))
                                 _log.warn("New address received, Blocklisting old peer " + key + ' ' + ri);