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

Ticket #1007 use only non-retransmitted packets in RTT

Browse Source 
sampling.  (RFC 6298)
This commit is contained in:
zab2
2013-08-31 18:39:29 +00:00
parent 41595cafce
commit 6812dc1db8
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,17 +290,21 @@ class ConnectionPacketHandler {
_log.debug(acked.size() + " of our packets acked with " + packet);
// use the highest RTT, since these would likely be bunched together,
// and the highest rtt lets us set our resend delay properly
// RFC 6298 part 3 dictates only use packets that haven't been re-sent.
int highestRTT = -1;
for (int i = 0; i < acked.size(); i++) {
PacketLocal p = acked.get(i);
if (p.getAckTime() > highestRTT) {
//if (p.getNumSends() <= 1)
highestRTT = p.getAckTime();
}
_context.statManager().addRateData("stream.sendsBeforeAck", p.getNumSends(), p.getAckTime());
if (p.getNumSends() > 1)
final int numSends = p.getNumSends();
final int ackTime = p.getAckTime();
if (numSends > 1)
numResends++;
else if (ackTime > highestRTT)
highestRTT = ackTime;
_context.statManager().addRateData("stream.sendsBeforeAck", numSends, ackTime);
// ACK the tags we delivered so we can use them
//if ( (p.getKeyUsed() != null) && (p.getTagsSent() != null)
@ -310,7 +314,7 @@ class ConnectionPacketHandler {
// p.getTagsSent());
//}
if (_log.shouldLog(Log.DEBUG))
_log.debug("Packet acked after " + p.getAckTime() + "ms: " + p);
_log.debug("Packet acked after " + ackTime + "ms: " + p);
}
if (highestRTT > 0) {
int oldrtt = con.getOptions().getRTT();