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

update StopWaitings when queueing retransmissions

Browse Source 
fixes #231
This commit is contained in:
Marten Seemann
2016-07-30 15:15:51 +07:00
parent 6a34b9bdf0
commit e8a2c497e9
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ackhandler/sent_packet_handler.go
View File

@@ -115,6 +115,10 @@ func (h *sentPacketHandler) queuePacketForRetransmission(packet *ackhandlerlegac
}
}
}
// strictly speaking, this is only necessary for RTO retransmissions
// this is because FastRetransmissions are triggered by missing ranges in ACKs, and then the LargestAcked will already be higher than the packet number of the retransmitted packet
h.stopWaitingManager.QueuedRetransmissionForPacketNumber(packet.PacketNumber)
}
func (h *sentPacketHandler) SentPacket(packet *ackhandlerlegacy.Packet) error {

5
ackhandler/sent_packet_handler_test.go
View File

@@ -357,6 +357,11 @@ var _ = Describe("SentPacketHandler", func() {
Expect(err).ToNot(HaveOccurred())
Expect(handler.GetStopWaitingFrame()).To(Equal(&frames.StopWaitingFrame{LeastUnacked: 6}))
})
It("gets a StopWaitingFrame after queueing a retransmission", func() {
handler.queuePacketForRetransmission(&ackhandlerlegacy.Packet{PacketNumber: 5, Frames: []frames.Frame{&streamFrame}, Length: 1})
Expect(handler.GetStopWaitingFrame()).To(Equal(&frames.StopWaitingFrame{LeastUnacked: 6}))
})
})
Context("calculating RTT", func() {

6
ackhandler/stop_waiting_manager.go
View File

@@ -27,3 +27,9 @@ func (s *stopWaitingManager) ReceivedAck(ack *frames.AckFrame) {
s.nextLeastUnacked = ack.LargestAcked + 1
}
}
func (s *stopWaitingManager) QueuedRetransmissionForPacketNumber(p protocol.PacketNumber) {
if p >= s.nextLeastUnacked {
s.nextLeastUnacked = p + 1
}
}

12
ackhandler/stop_waiting_manager_test.go
View File

@@ -32,4 +32,16 @@ var _ = Describe("StopWaitingManager", func() {
Expect(manager.GetStopWaitingFrame()).ToNot(BeNil())
Expect(manager.GetStopWaitingFrame()).To(BeNil())
})
It("increases the LeastUnacked when a retransmission is queued", func() {
manager.ReceivedAck(&frames.AckFrame{LargestAcked: 10})
manager.QueuedRetransmissionForPacketNumber(20)
Expect(manager.GetStopWaitingFrame()).To(Equal(&frames.StopWaitingFrame{LeastUnacked: 21}))
})
It("does not decrease the LeastUnacked when a retransmission is queued", func() {
manager.ReceivedAck(&frames.AckFrame{LargestAcked: 10})
manager.QueuedRetransmissionForPacketNumber(9)
Expect(manager.GetStopWaitingFrame()).To(Equal(&frames.StopWaitingFrame{LeastUnacked: 11}))
})
})