Merge pull request #1876 from lucas-clemente/fix-pto

fix dequeuing of probe packets
quic-go · Apr 16, 2019 · 24fed6d · 24fed6d
2 parents ffcbbb5 + 37083e4
commit 24fed6d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/internal/ackhandler/sent_packet_handler.go b/internal/ackhandler/sent_packet_handler.go
@@ -465,6 +465,8 @@ func (h *sentPacketHandler) onPacketAcked(p *Packet, rcvTime time.Time) error {
  }
  h.rtoCount = 0
  h.tlpCount = 0
+ h.numRTOs = 0
+ h.allowTLP = false
  h.handshakeCount = 0
  return h.packetHistory.Remove(p.PacketNumber)
 }

diff --git a/internal/ackhandler/sent_packet_handler_test.go b/internal/ackhandler/sent_packet_handler_test.go
@@ -927,6 +927,30 @@ var _ = Describe("SentPacketHandler", func() {
  Expect(handler.SendMode()).ToNot(Equal(SendRTO))
  })
 
+ It("resets the send mode when it receives an acknowledgement after queueing probe packets", func() {
+ handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 1, SendTime: time.Now().Add(-time.Hour)}))
+ handler.rttStats.UpdateRTT(time.Second, 0, time.Now())
+ handler.OnAlarm() // TLP
+ handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 2})) // send the first TLP
+ handler.OnAlarm() // TLP
+ handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 3})) // send the second TLP
+ handler.OnAlarm()
+ Expect(handler.SendMode()).To(Equal(SendRTO))
+ ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}}
+ Expect(handler.ReceivedAck(ack, 1, protocol.EncryptionForwardSecure, time.Now())).To(Succeed())
+ Expect(handler.SendMode()).To(Equal(SendAny))
+ })
+
+ It("resets the send mode when it receives an acknowledgement after queueing probe packets", func() {
+ handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 1, SendTime: time.Now().Add(-time.Hour)}))
+ handler.rttStats.UpdateRTT(time.Second, 0, time.Now())
+ handler.OnAlarm()
+ Expect(handler.SendMode()).To(Equal(SendTLP))
+ ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}}
+ Expect(handler.ReceivedAck(ack, 1, protocol.EncryptionForwardSecure, time.Now())).To(Succeed())
+ Expect(handler.SendMode()).To(Equal(SendAny))
+ })
+
  It("gets packets sent before the probe packet for retransmission", func() {
  handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 1, SendTime: time.Now().Add(-time.Hour)}))
  handler.SentPacket(retransmittablePacket(&Packet{PacketNumber: 2, SendTime: time.Now().Add(-time.Hour)}))