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

i2psnark: Increase DHT blacklist time (ticket #2275)

Browse Source 
Update time if already blacklisted
Prune blacklist if too big
This commit is contained in:
zzz
2019-06-16 14:59:55 +00:00
parent 1ddc651b11
commit a542b182ea
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
View File

@ -156,7 +156,8 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
/** stagger with other cleaners */ /** stagger with other cleaners */
private static final long CLEAN_TIME = 63*1000; private static final long CLEAN_TIME = 63*1000;
private static final long EXPLORE_TIME = 877*1000; private static final long EXPLORE_TIME = 877*1000;
private static final long BLACKLIST_CLEAN_TIME = 17*60*1000; private static final long BLACKLIST_CLEAN_TIME = 67*60*1000;
private static final int BLACKLIST_MAX_PEERS = 500;
private static final long NODES_SAVE_TIME = 3*60*60*1000; private static final long NODES_SAVE_TIME = 3*60*60*1000;
public static final String DHT_FILE_SUFFIX = ".dht.dat"; public static final String DHT_FILE_SUFFIX = ".dht.dat";
@ -1232,10 +1233,12 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Removed after consecutive timeouts: " + nInfo); _log.info("Removed after consecutive timeouts: " + nInfo);
} }
if (!_blacklist.contains(nid)) { // remove and add back with new date, may not be same object
// used as when-added time // used as when-added time
nid.setLastSeen(); nid.setLastSeen();
_blacklist.add(nid); boolean already = _blacklist.remove(nid);
_blacklist.add(nid);
if (!already) {
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Blacklisted: " + nid); _log.info("Blacklisted: " + nid);
} }
@ -1686,6 +1689,14 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
if (nid.lastSeen() < expire) if (nid.lastSeen() < expire)
iter.remove(); iter.remove();
} }
int sz = _blacklist.size();
if (sz > BLACKLIST_MAX_PEERS) {
// just remove random peers
for (Iterator<NID> iter = _blacklist.iterator(); iter.hasNext() && sz > BLACKLIST_MAX_PEERS; sz--) {
iter.next();
iter.remove();
}
}
if (now - _nodesLastSaved > NODES_SAVE_TIME) { if (now - _nodesLastSaved > NODES_SAVE_TIME) {
PersistDHT.saveDHT(_knownNodes, false, _dhtFile); PersistDHT.saveDHT(_knownNodes, false, _dhtFile);
_nodesLastSaved = now; _nodesLastSaved = now;