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

remove Entropy from QUIC 34 StopWaitingManager

Browse Source 
ref #55
This commit is contained in:
Marten Seemann
2016-06-23 11:03:31 +07:00
parent b9091ad26c
commit 9bb8a56b94
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ackhandlernew/stop_waiting_manager.go
View File

@@ -30,7 +30,6 @@ func (h *stopWaitingManager) RegisterPacketForRetransmission(packet *Packet) {
if h.currentStopWaitingFrame == nil || h.currentStopWaitingFrame.LeastUnacked <= packet.PacketNumber { // <= because for StopWaitingFrames LeastUnacked = packet.PacketNumber + 1
h.currentStopWaitingFrame = &frames.StopWaitingFrame{
LeastUnacked: packet.PacketNumber + 1,
Entropy: byte(packet.Entropy),
}
h.maxRetransmittedPacketNumber = packet.PacketNumber
h.currentStopWaitingFrameSent = false

17
ackhandlernew/stop_waiting_manager_test.go
View File

@@ -18,39 +18,36 @@ var _ = Describe("StopWaitingManager", func() {
It("gets a StopWaitingFrame after a packet has been registered for retransmission", func() {
leastUnacked := protocol.PacketNumber(10)
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked, Entropy: 10})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked})
swf := manager.GetStopWaitingFrame()
Expect(swf).ToNot(BeNil())
Expect(swf.LeastUnacked).To(Equal(leastUnacked + 1))
Expect(swf.Entropy).To(Equal(byte(10)))
})
It("always gets the StopWaitingFrame for the highest retransmitted packet number", func() {
leastUnacked := protocol.PacketNumber(10)
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked, Entropy: 10})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1, Entropy: 8})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1})
swf := manager.GetStopWaitingFrame()
Expect(swf).ToNot(BeNil())
Expect(swf.LeastUnacked).To(Equal(leastUnacked + 1))
Expect(swf.Entropy).To(Equal(byte(10)))
})
It("updates the StopWaitingFrame when a packet with a higher packet number is retransmitted", func() {
leastUnacked := protocol.PacketNumber(10)
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1, Entropy: 10})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked, Entropy: 8})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked})
swf := manager.GetStopWaitingFrame()
Expect(swf).ToNot(BeNil())
Expect(swf.LeastUnacked).To(Equal(leastUnacked + 1))
Expect(swf.Entropy).To(Equal(byte(8)))
})
It("does not create a new StopWaitingFrame for an out-of-order retransmission", func() {
leastUnacked := protocol.PacketNumber(10)
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked, Entropy: 8})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked})
manager.SentStopWaitingWithPacket(12)
manager.ReceivedAckForPacketNumber(12)
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1, Entropy: 10})
manager.RegisterPacketForRetransmission(&Packet{PacketNumber: leastUnacked - 1})
swf := manager.GetStopWaitingFrame()
Expect(swf).To(BeNil())
})