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

fix the exponential backoff when sending handshake retransmissions

Browse Source
This commit is contained in:
Marten Seemann
2017-10-30 15:44:52 +07:00
parent 515babb4bd
commit f412faad7b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ackhandler/sent_packet_handler.go
View File

@@ -308,6 +308,7 @@ func (h *sentPacketHandler) OnAlarm() {
// TODO(#497): TLP // TODO(#497): TLP
if !h.handshakeComplete { if !h.handshakeComplete {
h.queueHandshakePacketsForRetransmission() h.queueHandshakePacketsForRetransmission()
h.handshakeCount++
} else if !h.lossTime.IsZero() { } else if !h.lossTime.IsZero() {
// Early retransmit or time loss detection // Early retransmit or time loss detection
h.detectLostPackets() h.detectLostPackets()

6
ackhandler/sent_packet_handler_test.go
View File

@@ -846,7 +846,8 @@ var _ = Describe("SentPacketHandler", func() {
err = handler.ReceivedAck(&wire.AckFrame{LargestAcked: 1, LowestAcked: 1}, 1, time.Now().Add(time.Hour)) err = handler.ReceivedAck(&wire.AckFrame{LargestAcked: 1, LowestAcked: 1}, 1, time.Now().Add(time.Hour))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(handler.lossTime.IsZero()).To(BeTrue()) Expect(handler.lossTime.IsZero()).To(BeTrue())
Expect(handler.GetAlarmTimeout().Sub(time.Now())).To(BeNumerically("~", handler.computeHandshakeTimeout(), time.Minute)) handshakeTimeout := handler.computeHandshakeTimeout()
Expect(handler.GetAlarmTimeout().Sub(time.Now())).To(BeNumerically("~", handshakeTimeout, time.Minute))
handler.OnAlarm() handler.OnAlarm()
p := handler.DequeuePacketForRetransmission() p := handler.DequeuePacketForRetransmission()
@@ -857,6 +858,9 @@ var _ = Describe("SentPacketHandler", func() {
Expect(p.PacketNumber).To(Equal(protocol.PacketNumber(4))) Expect(p.PacketNumber).To(Equal(protocol.PacketNumber(4)))
Expect(handler.packetHistory.Len()).To(Equal(1)) Expect(handler.packetHistory.Len()).To(Equal(1))
Expect(handler.packetHistory.Front().Value.PacketNumber).To(Equal(protocol.PacketNumber(3))) Expect(handler.packetHistory.Front().Value.PacketNumber).To(Equal(protocol.PacketNumber(3)))
Expect(handler.handshakeCount).To(BeEquivalentTo(1))
// make sure the exponential backoff is used
Expect(handler.computeHandshakeTimeout()).To(BeNumerically("~", 2*handshakeTimeout, time.Minute))
}) })
}) })