I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Tunnels: Enforce max tunnel length of 8, catch an index error

Browse Source 
http://forum.i2p/viewtopic.php?t=2561
This commit is contained in:
zzz
2008-02-19 15:28:41 +00:00
parent bc16078e3f
commit 918b1acb8f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
View File

@ -224,6 +224,10 @@ class BuildHandler {
for (int i = 0; i < cfg.getLength(); i++) { for (int i = 0; i < cfg.getLength(); i++) {
Hash peer = cfg.getPeer(i); Hash peer = cfg.getPeer(i);
int record = order.indexOf(new Integer(i)); int record = order.indexOf(new Integer(i));
if (record < 0) {
_log.error("Bad status index " + i);
return;
}
int howBad = statuses[record]; int howBad = statuses[record];
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info(msg.getUniqueId() + ": Peer " + peer.toBase64() + " replied with status " + howBad); _log.info(msg.getUniqueId() + ": Peer " + peer.toBase64() + " replied with status " + howBad);

6
router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
View File

@ -43,9 +43,11 @@ public abstract class TunnelPeerSelector {
else else
length -= off; length -= off;
} }
if (length < 0)
length = 0;
} }
if (length < 0)
length = 0;
if (length > 8) // as documented in tunnel.html
length = 8;
/* /*
if ( (ctx.tunnelManager().getOutboundTunnelCount() <= 0) || if ( (ctx.tunnelManager().getOutboundTunnelCount() <= 0) ||
(ctx.tunnelManager().getFreeTunnelCount() <= 0) ) { (ctx.tunnelManager().getFreeTunnelCount() <= 0) ) {