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

* 2006-05-09 0.6.1.18 released

Browse Source 
2006-05-09  jrandom
    * Further tunnel creation timeout revamp
This commit is contained in:
jrandom
2006-05-09 21:17:17 +00:00
committed by zzz
parent 6b0d507644
commit 870e94e184
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.410 $ $Date: 2006/05/06 15:27:35 $";
public final static String VERSION = "0.6.1.17";
public final static long BUILD = 9;
public final static String ID = "$Revision: 1.411 $ $Date: 2006/05/07 22:19:47 $";
public final static String VERSION = "0.6.1.18";
public final static long BUILD = 0;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);

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

@@ -86,7 +86,7 @@ class BuildHandler {
handled.add(_inboundBuildMessages.remove(_inboundBuildMessages.size()-1));
} else {
// drop any expired messages
long dropBefore = System.currentTimeMillis() - (BuildRequestor.REQUEST_TIMEOUT*2);
long dropBefore = System.currentTimeMillis() - (BuildRequestor.REQUEST_TIMEOUT*3);
do {
BuildMessageState state = (BuildMessageState)_inboundBuildMessages.get(0);
if (state.recvTime <= dropBefore) {
@@ -278,7 +278,7 @@ class BuildHandler {
if (_log.shouldLog(Log.DEBUG))
_log.debug(state.msg.getUniqueId() + ": handling request after " + timeSinceReceived);
if (timeSinceReceived > (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()) ) {

2
router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
View File

@@ -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");