diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 1fcd5ec66..8ec769dd8 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.59 $ $Date: 2006/04/15 02:58:13 $"; - public final static String VERSION = "0.6.1.17"; + public final static String ID = "$Revision: 1.60 $ $Date: 2006/04/23 16:06:13 $"; + public final static String VERSION = "0.6.1.18"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index 2b7689a20..ac8835954 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,9 @@ -$Id: history.txt,v 1.470 2006/05/06 15:27:35 jrandom Exp $ +$Id: history.txt,v 1.471 2006/05/07 22:19:46 complication Exp $ + +* 2006-05-09 0.6.1.18 released + +2006-05-09 jrandom + * Further tunnel creation timeout revamp 2006-05-07 Complication * Fix problem whereby repeated calls to allowed() would make diff --git a/initialNews.xml b/initialNews.xml index e194475ee..e22b52458 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.17 + 0.6.1.18 diff --git a/news.xml b/news.xml index a59dd8f3f..52dfb314c 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + (BuildRequestor.REQUEST_TIMEOUT*2)) { + if (timeSinceReceived > (BuildRequestor.REQUEST_TIMEOUT*3)) { // don't even bother, since we are so overloaded locally if (_log.shouldLog(Log.WARN)) _log.warn("Not even trying to handle/decrypt the request " + state.msg.getUniqueId() @@ -417,7 +417,7 @@ class BuildHandler { int proactiveDrops = countProactiveDrops(); long recvDelay = System.currentTimeMillis()-state.recvTime; if (response == 0) { - float pDrop = recvDelay / (BuildRequestor.REQUEST_TIMEOUT*2); + float pDrop = recvDelay / (BuildRequestor.REQUEST_TIMEOUT*3); pDrop = (float)Math.pow(pDrop, 16); if (_context.random().nextFloat() < pDrop) { // || (proactiveDrops > MAX_PROACTIVE_DROPS) ) ) { _context.statManager().addRateData("tunnel.rejectOverloaded", recvDelay, proactiveDrops); @@ -600,7 +600,7 @@ class BuildHandler { for (int i = 0; i < _inboundBuildMessages.size(); i++) { BuildMessageState cur = (BuildMessageState)_inboundBuildMessages.get(i); long age = System.currentTimeMillis() - cur.recvTime; - if (age >= BuildRequestor.REQUEST_TIMEOUT*2) { + if (age >= BuildRequestor.REQUEST_TIMEOUT*3) { _inboundBuildMessages.remove(i); i--; dropped++; @@ -612,7 +612,7 @@ class BuildHandler { _context.statManager().addRateData("tunnel.dropLoadBacklog", _inboundBuildMessages.size(), _inboundBuildMessages.size()); } else { int queueTime = estimateQueueTime(_inboundBuildMessages.size()); - float pDrop = queueTime/((float)BuildRequestor.REQUEST_TIMEOUT*2); + float pDrop = queueTime/((float)BuildRequestor.REQUEST_TIMEOUT*3); pDrop = (float)Math.pow(pDrop, 16); // steeeep float f = _context.random().nextFloat(); if ( (pDrop > f) && (allowProactiveDrop()) ) { diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 4d584a8c3..cd117d17d 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -22,7 +22,7 @@ class BuildRequestor { ORDER.add(new Integer(i)); } private static final int PRIORITY = 500; - static final int REQUEST_TIMEOUT = 15*1000; + static final int REQUEST_TIMEOUT = 10*1000; private static boolean usePairedTunnels(RouterContext ctx) { String val = ctx.getProperty("router.usePairedTunnels");