mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

ackhandler: fix handling of lost path probes on loss timer (#4956)

Browse source
This commit is contained in:
Marten Seemann 2025-02-14 15:29:42 +01:00 • committed by GitHub
parent bf28da8346
commit 9f704c72cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/ackhandler/sent_packet_handler.go
View file

@ -658,6 +658,7 @@ func (h *sentPacketHandler) detectLostPathProbes(now time.Time) {
for _, f := range p.Frames { for _, f := range p.Frames {
f.Handler.OnLost(f.Frame) f.Handler.OnLost(f.Frame)
} }
h.appDataPackets.history.Remove(p.PacketNumber)
h.appDataPackets.history.RemovePathProbe(p.PacketNumber) h.appDataPackets.history.RemovePathProbe(p.PacketNumber)
} }
} }

13
internal/ackhandler/sent_packet_handler_test.go
View file

@ -1205,13 +1205,19 @@ func TestSentPacketHandlerPathProbeAckAndLoss(t *testing.T) {
t1 := now t1 := now
now = now.Add(100 * time.Millisecond) now = now.Add(100 * time.Millisecond)
_ = sendPacket(now, true) _ = sendPacket(now, true)
t2 := now
now = now.Add(100 * time.Millisecond) now = now.Add(100 * time.Millisecond)
pn3 := sendPacket(now, true) pn3 := sendPacket(now, true)
now = now.Add(100 * time.Millisecond) now = now.Add(100 * time.Millisecond)
require.Equal(t, t1.Add(pathProbePacketLossTimeout), sph.GetLossDetectionTimeout()) require.Equal(t, t1.Add(pathProbePacketLossTimeout), sph.GetLossDetectionTimeout())
require.NoError(t, sph.OnLossDetectionTimeout(sph.GetLossDetectionTimeout()))
require.Equal(t, []protocol.PacketNumber{pn1}, packets.Lost)
packets.Lost = packets.Lost[:0]
// receive a delayed ACK for the path probe packet
_, err := sph.ReceivedAck( _, err := sph.ReceivedAck(
&wire.AckFrame{AckRanges: ackRanges(pn3)}, &wire.AckFrame{AckRanges: ackRanges(pn1, pn3)},
protocol.Encryption1RTT, protocol.Encryption1RTT,
now, now,
) )
@ -1219,8 +1225,5 @@ func TestSentPacketHandlerPathProbeAckAndLoss(t *testing.T) {
require.Equal(t, []protocol.PacketNumber{pn3}, packets.Acked) require.Equal(t, []protocol.PacketNumber{pn3}, packets.Acked)
require.Empty(t, packets.Lost) require.Empty(t, packets.Lost)
require.Equal(t, t1.Add(pathProbePacketLossTimeout), sph.GetLossDetectionTimeout()) require.Equal(t, t2.Add(pathProbePacketLossTimeout), sph.GetLossDetectionTimeout())
require.NoError(t, sph.OnLossDetectionTimeout(sph.GetLossDetectionTimeout()))
require.Equal(t, []protocol.PacketNumber{pn1}, packets.Lost)
} }