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

Snark DHT:

Browse Source 
- Increase dest lookup and search timeouts
   - Increase max search depth
   - Loop tracker client faster when in magnet mode
   - Loop tracker client faster if DHT announce fails
   - Don't return an empty peers list if we only know about the requestor
   - volatiles, log tweaks
   - Major fixes of getPeers() to follow
This commit is contained in:
zzz
2013-10-09 13:06:47 +00:00
parent 8872437caf
commit 7513d42e9e
5 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,15 +379,24 @@ public class TrackerClient implements Runnable {
if (dht != null && (meta == null || !meta.isPrivate()))
dht.announce(snark.getInfoHash());
int oldSeenPeers = snark.getTrackerSeenPeers();
int maxSeenPeers = 0;
if (!trackers.isEmpty())
if (!trackers.isEmpty()) {
maxSeenPeers = getPeersFromTrackers(trackers);
// fast update for UI at startup
if (maxSeenPeers > oldSeenPeers)
snark.setTrackerSeenPeers(maxSeenPeers);
}
int p = getPeersFromPEX();
if (p > maxSeenPeers)
maxSeenPeers = p;
p = getPeersFromDHT();
if (p > maxSeenPeers)
if (p > maxSeenPeers) {
maxSeenPeers = p;
// fast update for UI at startup
if (maxSeenPeers > oldSeenPeers)
snark.setTrackerSeenPeers(maxSeenPeers);
}
// backup if DHT needs bootstrapping
if (trackers.isEmpty() && !backupTrackers.isEmpty() && dht != null && dht.size() < 16) {
p = getPeersFromTrackers(backupTrackers);
@@ -616,17 +625,18 @@ public class TrackerClient implements Runnable {
// FIXME this needs to be in its own thread
int rv = 0;
DHT dht = _util.getDHT();
if (dht != null && (meta == null || !meta.isPrivate()) && (!stop) &&
_util.getContext().clock().now() > lastDHTAnnounce + MIN_DHT_ANNOUNCE_INTERVAL) {
if (dht != null &&
(meta == null || !meta.isPrivate()) &&
(!stop) &&
(meta == null || _util.getContext().clock().now() > lastDHTAnnounce + MIN_DHT_ANNOUNCE_INTERVAL)) {
int numwant;
if (!coordinator.needOutboundPeers())
numwant = 1;
else
numwant = _util.getMaxConnections();
Collection<Hash> hashes = dht.getPeers(snark.getInfoHash(), numwant, 2*60*1000);
Collection<Hash> hashes = dht.getPeers(snark.getInfoHash(), numwant, 5*60*1000);
if (!hashes.isEmpty()) {
runStarted = true;
lastDHTAnnounce = _util.getContext().clock().now();
rv = hashes.size();
}
if (_log.shouldLog(Log.INFO))
@@ -638,6 +648,10 @@ public class TrackerClient implements Runnable {
int good = dht.announce(snark.getInfoHash(), 1, 5*60*1000);
if (_log.shouldLog(Log.INFO))
_log.info("Sent " + good + " good announces to DHT");
if (good > 0)
lastDHTAnnounce = _util.getContext().clock().now();
else
lastDHTAnnounce = 0;
}
// now try these peers