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

i2psnark: Randomize announce list order and limit size

Browse Source
This commit is contained in:
zzz
2014-04-17 18:36:37 +00:00
parent 88899c1233
commit 1039a4b7a0
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
View File

@ -84,6 +84,7 @@ public class TrackerClient implements Runnable {
private final static long MIN_TRACKER_ANNOUNCE_INTERVAL = 15*60*1000; private final static long MIN_TRACKER_ANNOUNCE_INTERVAL = 15*60*1000;
private final static long MIN_DHT_ANNOUNCE_INTERVAL = 10*60*1000; private final static long MIN_DHT_ANNOUNCE_INTERVAL = 10*60*1000;
public static final int PORT = 6881; public static final int PORT = 6881;
private static final int MAX_TRACKERS = 12;
private final I2PSnarkUtil _util; private final I2PSnarkUtil _util;
private final MetaInfo meta; private final MetaInfo meta;
@ -288,6 +289,7 @@ public class TrackerClient implements Runnable {
} }
// announce list // announce list
// We completely ignore the BEP 12 processing rules
if (meta != null && !meta.isPrivate()) { if (meta != null && !meta.isPrivate()) {
List<List<String>> list = meta.getAnnounceList(); List<List<String>> list = meta.getAnnounceList();
if (list != null) { if (list != null) {
@ -300,6 +302,12 @@ public class TrackerClient implements Runnable {
_log.debug("Additional announce (list): [" + url + "] for infoHash: " + infoHash); _log.debug("Additional announce (list): [" + url + "] for infoHash: " + infoHash);
} }
} }
if (trackers.size() > 2) {
// shuffle everything but the primary
TCTracker pri = trackers.remove(0);
Collections.shuffle(trackers, _util.getContext().random());
trackers.add(0, pri);
}
} }
} }
@ -345,7 +353,13 @@ public class TrackerClient implements Runnable {
private boolean isNewValidTracker(Set<Hash> existing, String ann) { private boolean isNewValidTracker(Set<Hash> existing, String ann) {
Hash h = getHostHash(ann); Hash h = getHostHash(ann);
if (h == null) { if (h == null) {
_log.error("Bad announce URL: [" + ann + ']'); if (_log.shouldLog(Log.WARN))
_log.warn("Bad announce URL: [" + ann + ']');
return false;
}
if (existing.size() >= MAX_TRACKERS) {
if (_log.shouldLog(Log.INFO))
_log.info("Not using announce URL, we have enough: [" + ann + ']');
return false; return false;
} }
boolean rv = existing.add(h); boolean rv = existing.add(h);