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

2005-10-24 jrandom

Browse Source 
* Defer netDb searches for newly referenced peers until we actually want
      them
    * Ignore netDb references to peers on our shitlist
    * Set the timeout for end to end client messages to the max delay after
      finding the leaseSet, so we don't have as many expired messages floating
      around.
    * Add a floor to the streaming lib window size
    * When we need to send a streaming lib ACK, try to retransmit one of the
      unacked packets instead (with updated ACK/NACK fields, of course).  The
      bandwidth cost of an unnecessary retransmission should be minor as
      compared to both an ACK packet (rounded up to 1KB in the tunnels) and
      the probability of a necessary retransmission.
    * Adjust the streaming lib cwin algorithm to allow growth after a full
      cwin messages if the rtt is trending downwards.  If it is not, use the
      existing algorithm.
    * Increased the maximum rto size in the streaming lib.
    * Load balancing bugfix on end to end messages to distribute across
      tunnels more evenly.
This commit is contained in:
jrandom
2005-10-25 19:13:53 +00:00
committed by zzz
parent 84383c3dab
commit 4de302101d
12 changed files with 225 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.275 $ $Date: 2005/10/20 14:42:16 $";
public final static String ID = "$Revision: 1.276 $ $Date: 2005/10/22 13:06:03 $";
public final static String VERSION = "0.6.1.3";
public final static long BUILD = 6;
public final static long BUILD = 7;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);

44
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@@ -151,9 +151,6 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
public void runJob() {
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": Send outbound client message job beginning");
buildClove();
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": Clove built to " + _toString);
long timeoutMs = _overallExpiration - getContext().clock().now();
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": preparing to search for the leaseSet for " + _toString);
@@ -210,9 +207,9 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
getContext().statManager().addRateData("client.leaseSetFoundRemoteTime", lookupTime, lookupTime);
}
boolean ok = getNextLease();
if (ok)
if (ok) {
send();
else {
} else {
if (_log.shouldLog(Log.ERROR))
_log.error("Unable to send on a random lease, as getNext returned null (to=" + _toString + ")");
dieFatal();
@@ -258,19 +255,23 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
// sort are randomly ordered)
Collections.shuffle(leases);
// ordered by lease number of failures
TreeMap orderedLeases = new TreeMap();
for (Iterator iter = leases.iterator(); iter.hasNext(); ) {
Lease lease = (Lease)iter.next();
long id = lease.getNumFailure();
while (orderedLeases.containsKey(new Long(id)))
id++;
orderedLeases.put(new Long(id), lease);
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": ranking lease we havent sent it down as " + id);
if (false) {
// ordered by lease number of failures
TreeMap orderedLeases = new TreeMap();
for (Iterator iter = leases.iterator(); iter.hasNext(); ) {
Lease lease = (Lease)iter.next();
long id = lease.getNumFailure();
while (orderedLeases.containsKey(new Long(id)))
id++;
orderedLeases.put(new Long(id), lease);
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": ranking lease we havent sent it down as " + id);
}
_lease = (Lease)orderedLeases.get(orderedLeases.firstKey());
} else {
_lease = (Lease)leases.get(0);
}
_lease = (Lease)orderedLeases.get(orderedLeases.firstKey());
return true;
}
@@ -320,7 +321,10 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
}
_inTunnel = selectInboundTunnel();
buildClove();
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": Clove built to " + _toString);
GarlicMessage msg = OutboundClientMessageJobHelper.createGarlicMessage(getContext(), token,
_overallExpiration, key,
_clove, _from.calculateHash(),
@@ -461,12 +465,12 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
clove.setCertificate(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null));
clove.setDeliveryInstructions(instructions);
clove.setExpiration(_overallExpiration);
clove.setExpiration(OVERALL_TIMEOUT_MS_DEFAULT+getContext().clock().now());
clove.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
DataMessage msg = new DataMessage(getContext());
msg.setData(_clientMessage.getPayload().getEncryptedData());
msg.setMessageExpiration(_overallExpiration);
msg.setMessageExpiration(clove.getExpiration());
clove.setPayload(msg);
clove.setRecipientPublicKey(null);

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

@@ -128,6 +128,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
_lastExploreNew = 0;
_activeRequests = new HashMap(8);
_enforceNetId = DEFAULT_ENFORCE_NETID;
context.statManager().createRateStat("netDb.lookupLeaseSetDeferred", "how many lookups are deferred for a single leaseSet lookup?", "NetworkDatabase", new long[] { 60*1000, 5*60*1000 });
}
protected PeerSelector createPeerSelector() { return new PeerSelector(_context); }
@@ -808,7 +809,8 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
} else {
if (_log.shouldLog(Log.INFO))
_log.info("Deferring search for " + key.toBase64() + " with " + onFindJob);
searchJob.addDeferred(onFindJob, onFailedLookupJob, timeoutMs, isLease);
int deferred = searchJob.addDeferred(onFindJob, onFailedLookupJob, timeoutMs, isLease);
_context.statManager().addRateData("netDb.lookupLeaseSetDeferred", deferred, searchJob.getExpiration()-_context.clock().now());
}
}

138
router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
View File

@@ -125,8 +125,8 @@ class SearchJob extends JobImpl {
protected SearchState getState() { return _state; }
protected KademliaNetworkDatabaseFacade getFacade() { return _facade; }
protected long getExpiration() { return _expiration; }
protected long getTimeoutMs() { return _timeoutMs; }
public long getExpiration() { return _expiration; }
public long getTimeoutMs() { return _timeoutMs; }
/**
* Let each peer take up to the average successful search RTT
@@ -164,8 +164,8 @@ class SearchJob extends JobImpl {
_state.complete(true);
succeed();
} else if (isExpired()) {
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": Key search expired");
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": Key search expired");
_state.complete(true);
fail();
} else {
@@ -208,51 +208,61 @@ class SearchJob extends JobImpl {
requeuePending();
return;
}
List closestHashes = getClosestRouters(_state.getTarget(), toCheck, _state.getAttempted());
if ( (closestHashes == null) || (closestHashes.size() <= 0) ) {
if (_state.getPending().size() <= 0) {
// we tried to find some peers, but there weren't any and no one else is going to answer
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": No peers left, and none pending! Already searched: "
+ _state.getAttempted().size() + " failed: " + _state.getFailed().size());
fail();
} else {
// no more to try, but we might get data or close peers from some outstanding requests
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": No peers left, but some are pending! Pending: "
+ _state.getPending().size() + " attempted: " + _state.getAttempted().size()
+ " failed: " + _state.getFailed().size());
requeuePending();
return;
}
} else {
_state.addPending(closestHashes);
int sent = 0;
for (Iterator iter = closestHashes.iterator(); iter.hasNext(); ) {
Hash peer = (Hash)iter.next();
DataStructure ds = _facade.getDataStore().get(peer);
if ( (ds == null) || !(ds instanceof RouterInfo) ) {
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": Error selecting closest hash that wasnt a router! "
+ peer + " : " + (ds == null ? "null" : ds.getClass().getName()));
_state.replyTimeout(peer);
int sent = 0;
Set attempted = _state.getAttempted();
while (sent <= 0) {
List closestHashes = getClosestRouters(_state.getTarget(), toCheck, attempted);
if ( (closestHashes == null) || (closestHashes.size() <= 0) ) {
if (_state.getPending().size() <= 0) {
// we tried to find some peers, but there weren't any and no one else is going to answer
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": No peers left, and none pending! Already searched: "
+ _state.getAttempted().size() + " failed: " + _state.getFailed().size());
fail();
} else {
if (getContext().shitlist().isShitlisted(peer)) {
// dont bother
// no more to try, but we might get data or close peers from some outstanding requests
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": No peers left, but some are pending! Pending: "
+ _state.getPending().size() + " attempted: " + _state.getAttempted().size()
+ " failed: " + _state.getFailed().size());
requeuePending();
}
return;
} else {
attempted.addAll(closestHashes);
for (Iterator iter = closestHashes.iterator(); iter.hasNext(); ) {
Hash peer = (Hash)iter.next();
DataStructure ds = _facade.getDataStore().get(peer);
if (ds == null) {
if (_log.shouldLog(Log.INFO))
_log.info("Next closest peer " + peer + " was only recently referred to us, sending a search for them");
getContext().netDb().lookupRouterInfo(peer, null, null, _timeoutMs);
} else if (!(ds instanceof RouterInfo)) {
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": Error selecting closest hash that wasnt a router! "
+ peer + " : " + (ds == null ? "null" : ds.getClass().getName()));
_state.replyTimeout(peer);
} else {
sendSearch((RouterInfo)ds);
sent++;
if (getContext().shitlist().isShitlisted(peer)) {
// dont bother
} else {
_state.addPending(peer);
sendSearch((RouterInfo)ds);
sent++;
}
}
}
}
if (sent <= 0) {
// the (potentially) last peers being searched for could not be,
// er, searched for, so lets retry ASAP (causing either another
// peer to be selected, or the whole search to fail)
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": No new peer queued up, so we are going to requeue " +
"ourselves in our search for " + _state.getTarget().toBase64());
requeuePending(0);
/*
if (sent <= 0) {
// the (potentially) last peers being searched for could not be,
// er, searched for, so lets retry ASAP (causing either another
// peer to be selected, or the whole search to fail)
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": No new peer queued up, so we are going to requeue " +
"ourselves in our search for " + _state.getTarget().toBase64());
requeuePending(0);
}
*/
}
}
}
@@ -503,6 +513,8 @@ class SearchJob extends JobImpl {
} else {
Hash peer = _msg.getReply(_curIndex);
boolean shouldAdd = false;
RouterInfo info = getContext().netDb().lookupRouterInfoLocally(peer);
if (info == null) {
// if the peer is giving us lots of bad peer references,
@@ -512,11 +524,18 @@ class SearchJob extends JobImpl {
if (!sendsBadInfo) {
// we don't need to search for everthing we're given here - only ones that
// are next in our search path...
getContext().netDb().lookupRouterInfo(peer, new ReplyVerifiedJob(getContext(), peer), new ReplyNotVerifiedJob(getContext(), peer), _timeoutMs);
_repliesPendingVerification++;
if (getContext().shitlist().isShitlisted(peer)) {
if (_log.shouldLog(Log.INFO))
_log.info("Not looking for a shitlisted peer...");
getContext().statManager().addRateData("netDb.searchReplyValidationSkipped", 1, 0);
} else {
//getContext().netDb().lookupRouterInfo(peer, new ReplyVerifiedJob(getContext(), peer), new ReplyNotVerifiedJob(getContext(), peer), _timeoutMs);
//_repliesPendingVerification++;
shouldAdd = true;
}
} else {
if (_log.shouldLog(Log.WARN))
_log.warn("Peer " + _peer.toBase64() + " sends us bad replies, so not verifying " + peer.toBase64());
if (_log.shouldLog(Log.INFO))
_log.info("Peer " + _peer.toBase64() + " sends us bad replies, so not verifying " + peer.toBase64());
getContext().statManager().addRateData("netDb.searchReplyValidationSkipped", 1, 0);
}
}
@@ -527,10 +546,12 @@ class SearchJob extends JobImpl {
if (_log.shouldLog(Log.DEBUG))
_log.debug(getJobId() + ": dbSearchReply received on search referencing router "
+ peer);
if (_facade.getKBuckets().add(peer))
_newPeers++;
else
_seenPeers++;
if (shouldAdd) {
if (_facade.getKBuckets().add(peer))
_newPeers++;
else
_seenPeers++;
}
_curIndex++;
requeue(0);
@@ -597,8 +618,8 @@ class SearchJob extends JobImpl {
if (_state.completed()) return;
_state.replyTimeout(_peer);
if (_penalizePeer) {
if (_log.shouldLog(Log.WARN))
_log.warn("Penalizing peer for timeout on search: " + _peer.toBase64() + " after " + (getContext().clock().now() - _sentOn));
if (_log.shouldLog(Log.INFO))
_log.info("Penalizing peer for timeout on search: " + _peer.toBase64() + " after " + (getContext().clock().now() - _sentOn));
getContext().profileManager().dbLookupFailed(_peer);
} else {
if (_log.shouldLog(Log.ERROR))
@@ -736,14 +757,16 @@ class SearchJob extends JobImpl {
handleDeferred(false);
}
public void addDeferred(Job onFind, Job onFail, long expiration, boolean isLease) {
public int addDeferred(Job onFind, Job onFail, long expiration, boolean isLease) {
Search search = new Search(onFind, onFail, expiration, isLease);
boolean ok = true;
int deferred = 0;
synchronized (_deferredSearches) {
if (_deferredCleared)
ok = false;
else
_deferredSearches.add(search);
deferred = _deferredSearches.size();
}
if (!ok) {
@@ -754,6 +777,9 @@ class SearchJob extends JobImpl {
// the following /shouldn't/ be necessary, but it doesnt hurt
_facade.searchComplete(_state.getTarget());
_facade.search(_state.getTarget(), onFind, onFail, expiration - getContext().clock().now(), isLease);
return 0;
} else {
return deferred;
}
}

19
router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java
View File

@@ -104,6 +104,25 @@ class SearchState {
_attemptedPeers.addAll(pending);
}
}
public void addPending(Hash peer) {
synchronized (_pendingPeers) {
_pendingPeers.add(peer);
_pendingPeerTimes.put(peer, new Long(_context.clock().now()));
}
synchronized (_attemptedPeers) {
_attemptedPeers.add(peer);
}
}
/** we didn't actually want to add this peer as part of the pending list... */
public void removePending(Hash peer) {
synchronized (_pendingPeers) {
_pendingPeers.remove(peer);
_pendingPeerTimes.remove(peer);
}
synchronized (_attemptedPeers) {
_attemptedPeers.remove(peer);
}
}
/** how long did it take to get the reply, or -1 if we don't know */
public long dataFound(Hash peer) {

5
router/java/src/net/i2p/router/tunnel/pool/HandleTunnelCreateMessageJob.java
View File

@@ -72,7 +72,12 @@ public class HandleTunnelCreateMessageJob extends JobImpl {
}
}
/** don't accept requests to join for 15 minutes or more */
public static final int MAX_DURATION_SECONDS = 15*60;
private int shouldAccept() {
if (_request.getDurationSeconds() >= MAX_DURATION_SECONDS)
return TunnelHistory.TUNNEL_REJECT_CRIT;
Hash nextRouter = _request.getNextRouter();
if (nextRouter != null) {
RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(nextRouter);