gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

don't reject ACKs with a lower largest ACKed value

Browse Source
This commit is contained in:
Marten Seemann
2018-03-07 16:10:57 +07:00
parent c37433abce
commit 85d67ecce5
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/ackhandler/sent_packet_handler.go
View File

@@ -158,12 +158,7 @@ func (h *sentPacketHandler) ReceivedAck(ackFrame *wire.AckFrame, withPacketNumbe
return nil return nil
} }
h.largestReceivedPacketWithAck = withPacketNumber h.largestReceivedPacketWithAck = withPacketNumber
h.largestAcked = utils.MaxPacketNumber(h.largestAcked, ackFrame.LargestAcked)
// ignore repeated ACK (ACKs that don't have a higher LargestAcked than the last ACK)
if ackFrame.LargestAcked < h.lowestUnacked() {
return nil
}
h.largestAcked = ackFrame.LargestAcked
if h.skippedPacketsAcked(ackFrame) { if h.skippedPacketsAcked(ackFrame) {
return qerr.Error(qerr.InvalidAckData, "Received an ACK for a skipped packet number") return qerr.Error(qerr.InvalidAckData, "Received an ACK for a skipped packet number")

5
internal/ackhandler/sent_packet_handler_test.go
View File

@@ -803,10 +803,11 @@ var _ = Describe("SentPacketHandler", func() {
handler.SentPacket(retransmittablePacket(3)) handler.SentPacket(retransmittablePacket(3))
Expect(handler.lossTime.IsZero()).To(BeTrue()) Expect(handler.lossTime.IsZero()).To(BeTrue())
err := handler.ReceivedAck(&wire.AckFrame{LargestAcked: 1, LowestAcked: 1}, 1, protocol.EncryptionUnencrypted, time.Now().Add(time.Hour)) now := time.Now().Add(time.Hour)
err := handler.ReceivedAck(&wire.AckFrame{LargestAcked: 1, LowestAcked: 1}, 1, protocol.EncryptionUnencrypted, now)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(handler.lossTime.IsZero()).To(BeTrue()) Expect(handler.lossTime.IsZero()).To(BeTrue())
Expect(time.Until(handler.GetAlarmTimeout())).To(BeNumerically("~", handler.computeRTOTimeout(), time.Minute)) Expect(handler.GetAlarmTimeout().Sub(now)).To(BeNumerically("~", handler.computeRTOTimeout(), time.Minute))
// This means RTO, so both packets should be lost // This means RTO, so both packets should be lost
handler.OnAlarm() handler.OnAlarm()