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

Router: More efficiently check blocklist when receiving new RI

Browse Source
This commit is contained in:
zzz
2016-12-22 12:46:38 +00:00
parent e625e67b5d
commit 3846e08e68
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
router/java/src/net/i2p/router/Blocklist.java
View File

@@ -79,6 +79,12 @@ public class Blocklist {
private final File _blocklistFeedFile;
// 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";
/**
* Limits of transient (in-memory) blocklists.
@@ -105,12 +111,6 @@ public class Blocklist {
_log = new Log(Blocklist.class);
_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";
/**
* Loads the following files in-order:
@@ -656,6 +656,14 @@ public class Blocklist {
RouterInfo pinfo = _context.netDb().lookupRouterInfoLocally(peer);
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
for (RouterAddress pa : pinfo.getAddresses()) {
@@ -694,6 +702,27 @@ public class Blocklist {
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...
banlist(peer, ip);
return true;
}
}
return false;
}
/**
* calling this externally won't banlist the peer, this is just an IP check
*

4
router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
View File

@@ -160,7 +160,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
if (wasNew) {
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);
} else {
@@ -168,7 +168,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl {
Collection<RouterAddress> newAddr = ri.getAddresses();
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);
}