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

ticket #1062 - count duplicate packets towards RTT if we have

Browse Source 
never sampled it
This commit is contained in:
zab2
2013-10-13 17:05:59 +00:00
parent 20b2f7dcb1
commit d0f635e30c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,6 +629,10 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
computeRTO(); computeRTO();
} }
public synchronized boolean receivedAck() {
return _initState != AckInit.INIT;
}
/** How long after sending a packet will we wait before resending? /** How long after sending a packet will we wait before resending?
* @return delay for a retransmission in ms * @return delay for a retransmission in ms
*/ */

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

@ -299,6 +299,7 @@ class ConnectionPacketHandler {
return false; return false;
boolean lastPacketAcked = false; boolean lastPacketAcked = false;
final boolean receivedAck = con.getOptions().receivedAck();
if ( (acked != null) && (!acked.isEmpty()) ) { if ( (acked != null) && (!acked.isEmpty()) ) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(acked.size() + " of our packets acked with " + packet); _log.debug(acked.size() + " of our packets acked with " + packet);
@ -312,7 +313,7 @@ class ConnectionPacketHandler {
final int numSends = p.getNumSends(); final int numSends = p.getNumSends();
final int ackTime = p.getAckTime(); final int ackTime = p.getAckTime();
if (numSends > 1) if (numSends > 1 && receivedAck)
numResends++; numResends++;
else if (ackTime > highestRTT) else if (ackTime > highestRTT)
highestRTT = ackTime; highestRTT = ackTime;