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

Merge pull request #2657 from lucas-clemente/fix-pto-count-on-dropping-packet-number-space

Browse source 
reset the PTO count before setting the timer when dropping a PN space
This commit is contained in:
Marten Seemann 2020-07-08 15:38:38 +07:00 • committed by GitHub
commit 953f3472cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ackhandler/sent_packet_handler.go
View file

@ -168,13 +168,13 @@ func (h *sentPacketHandler) dropPackets(encLevel protocol.EncryptionLevel) {
default:
panic(fmt.Sprintf("Cannot drop keys for encryption level %s", encLevel))
}
h.setLossDetectionTimer()
if h.tracer != nil && h.ptoCount != 0 {
h.tracer.UpdatedPTOCount(0)
}
h.ptoCount = 0
h.numProbesToSend = 0
h.ptoMode = SendNone
h.setLossDetectionTimer()
}
func (h *sentPacketHandler) ReceivedBytes(n protocol.ByteCount) {

20
internal/ackhandler/sent_packet_handler_test.go
View file

@ -634,24 +634,36 @@ var _ = Describe("SentPacketHandler", func() {
It("resets the PTO mode and PTO count when a packet number space is dropped", func() {
handler.ReceivedPacket(protocol.EncryptionHandshake)
now := time.Now()
handler.rttStats.UpdateRTT(time.Second/2, 0, now)
Expect(handler.rttStats.SmoothedRTT()).To(Equal(time.Second / 2))
Expect(handler.rttStats.PTO(true)).To(And(
BeNumerically(">", time.Second),
BeNumerically("<", 2*time.Second),
))
sendTimeHandshake := now.Add(-2 * time.Minute)
sendTimeAppData := now.Add(-time.Minute)
handler.SentPacket(ackElicitingPacket(&Packet{
PacketNumber: 1,
EncryptionLevel: protocol.EncryptionHandshake,
SendTime: now.Add(-2 * time.Hour),
SendTime: sendTimeHandshake,
}))
handler.SentPacket(ackElicitingPacket(&Packet{
PacketNumber: 2,
SendTime: now.Add(-time.Hour),
SendTime: sendTimeAppData,
}))
// PTO timer based on the Handshake packet
Expect(handler.GetLossDetectionTimeout()).To(BeTemporally("~", now.Add(-2*time.Hour), time.Second))
Expect(handler.OnLossDetectionTimeout()).To(Succeed())
Expect(handler.ptoCount).To(BeEquivalentTo(1))
Expect(handler.SendMode()).To(Equal(SendPTOHandshake))
Expect(handler.GetLossDetectionTimeout()).To(Equal(sendTimeHandshake.Add(handler.rttStats.PTO(false) << 1)))
handler.SetHandshakeComplete()
handler.DropPackets(protocol.EncryptionHandshake)
// PTO timer based on the 1-RTT packet
Expect(handler.GetLossDetectionTimeout()).To(BeTemporally("~", now.Add(-time.Hour), time.Second))
Expect(handler.GetLossDetectionTimeout()).To(Equal(sendTimeAppData.Add(handler.rttStats.PTO(true)))) // no backoff. PTO count = 0
Expect(handler.SendMode()).ToNot(Equal(SendPTOHandshake))
Expect(handler.ptoCount).To(BeZero())
})