From 35b6926e4f44de40f3b1840ac67a2081aee5378f Mon Sep 17 00:00:00 2001 From: zab2 Date: Mon, 25 Nov 2013 19:21:27 +0000 Subject: [PATCH] Ticket #1047 : Do not adjust window on receiving dups. --- .../streaming/ConnectionPacketHandler.java | 16 +--------------- .../java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java index ef7c6cd0b..011c9497f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java @@ -365,22 +365,8 @@ class ConnectionPacketHandler { private boolean adjustWindow(Connection con, boolean isNew, long sequenceNum, int numResends, int acked, boolean choke) { boolean congested = false; if ( (!isNew) && (sequenceNum > 0) ) { - // dup real packet, or they told us to back off - int oldSize = con.getOptions().getWindowSize(); - con.congestionOccurred(); - oldSize >>>= 1; - if (oldSize <= 0) - oldSize = 1; - - // setRTT has its own ceiling - //con.getOptions().setRTT(con.getOptions().getRTT() + 10*1000); - con.getOptions().setWindowSize(oldSize); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Congestion occurred - new windowSize " + oldSize + " / " + con.getOptions().getWindowSize() + " congestionSeenAt: " - + con.getLastCongestionSeenAt() + " (#resends: " + numResends - + ") for " + con); - + _log.debug("Congestion occurred on the sending side. Not adjusting window "+con); congested = true; } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 98bd96d4e..fc03273f8 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 32; + public final static long BUILD = 33; /** for example "-test" */ public final static String EXTRA = "-rc";