From a695bae01968def15c423ab6120c6d1df910dbd2 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 29 Mar 2021 09:39:58 +0700 Subject: [PATCH] restart the loss detection timer when the server becomes unblocked --- internal/ackhandler/sent_packet_handler.go | 4 ++++ internal/ackhandler/sent_packet_handler_test.go | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/ackhandler/sent_packet_handler.go b/internal/ackhandler/sent_packet_handler.go index 8ceb4691..2c31fd89 100644 --- a/internal/ackhandler/sent_packet_handler.go +++ b/internal/ackhandler/sent_packet_handler.go @@ -194,7 +194,11 @@ func (h *sentPacketHandler) dropPackets(encLevel protocol.EncryptionLevel) { } func (h *sentPacketHandler) ReceivedBytes(n protocol.ByteCount) { + wasAmplificationLimit := h.isAmplificationLimited() h.bytesReceived += n + if wasAmplificationLimit && !h.isAmplificationLimited() { + h.setLossDetectionTimer() + } } func (h *sentPacketHandler) ReceivedPacket(encLevel protocol.EncryptionLevel) { diff --git a/internal/ackhandler/sent_packet_handler_test.go b/internal/ackhandler/sent_packet_handler_test.go index 6251d988..afc51194 100644 --- a/internal/ackhandler/sent_packet_handler_test.go +++ b/internal/ackhandler/sent_packet_handler_test.go @@ -828,7 +828,7 @@ var _ = Describe("SentPacketHandler", func() { Expect(handler.SendMode()).To(Equal(SendNone)) }) - It("cancels the loss detection timer when it is amplification limited", func() { + It("cancels the loss detection timer when it is amplification limited, and resets it when becoming unblocked", func() { handler.ReceivedBytes(300) handler.SentPacket(&Packet{ PacketNumber: 1, @@ -837,7 +837,11 @@ var _ = Describe("SentPacketHandler", func() { Frames: []Frame{{Frame: &wire.PingFrame{}}}, SendTime: time.Now(), }) + // Amplification limited. We don't need to set a timer now. Expect(handler.GetLossDetectionTimeout()).To(BeZero()) + // Unblock the server. Now we should fire up the timer. + handler.ReceivedBytes(1) + Expect(handler.GetLossDetectionTimeout()).ToNot(BeZero()) }) })