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

Streaming: Slow start fix from zlatinb

Browse Source
This commit is contained in:
zzz
2020-04-17 12:02:26 +00:00
parent da9bfd48c0
commit 35bb5896a1
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
View File

@ -156,7 +156,7 @@ class Connection {
_createdOn = _context.clock().now(); _createdOn = _context.clock().now();
_congestionWindowEnd = _options.getWindowSize()-1; _congestionWindowEnd = _options.getWindowSize()-1;
_highestAckedThrough = -1; _highestAckedThrough = -1;
_ssthresh = _options.getMaxWindowSize(); _ssthresh = ConnectionPacketHandler.MAX_SLOW_START_WINDOW;
_lastCongestionTime = -1; _lastCongestionTime = -1;
_lastCongestionHighestUnacked = -1; _lastCongestionHighestUnacked = -1;
_lastReceivedOn = -1; _lastReceivedOn = -1;
@ -1562,7 +1562,7 @@ class Connection {
if (_packet.getNumSends() == 1) { if (_packet.getNumSends() == 1) {
int flightSize = getUnackedPacketsSent(); int flightSize = getUnackedPacketsSent();
_ssthresh = Math.max( flightSize / 2, 2 ); _ssthresh = Math.min(ConnectionPacketHandler.MAX_SLOW_START_WINDOW, Math.max( flightSize / 2, 2 ));
} }
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))

5
apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
View File

@ -445,10 +445,7 @@ class ConnectionPacketHandler {
// as it often leads to a big packet loss (30-50) all at once that // as it often leads to a big packet loss (30-50) all at once that
// takes quite a while (a minute or more) to recover from, // takes quite a while (a minute or more) to recover from,
// especially if crypto tags are lost // especially if crypto tags are lost
if (newWindowSize >= MAX_SLOW_START_WINDOW) newWindowSize = Math.min(ssthresh, newWindowSize + acked);
newWindowSize++;
else
newWindowSize = Math.min(ssthresh, newWindowSize + acked);
} else if (acked < factor) } else if (acked < factor)
newWindowSize++; newWindowSize++;
else else

7
history.txt
View File

@ -1,3 +1,10 @@
2020-04-17 zzz
* Crypto: Disable speculative AES tagset usage
* Streaming: Slow start fix
2020-04-16 zzz
* Build: Reproducible build fix (ticket #2279)
2020-04-14 zzz 2020-04-14 zzz
* Ratchet: Improve muxed decrypt * Ratchet: Improve muxed decrypt
* Streaming: * Streaming:

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

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 9; public final static long BUILD = 10;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";