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

ReceivedPacketHandler only generates ACKs if packets were received after the last ACK

Browse source
This commit is contained in:
Marten Seemann 2016-04-26 22:38:10 +07:00
parent 43a16a8fce
commit e27d3ea3f8
2 changed files with 58 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ackhandler/received_packet_handler.go
View file

@ -14,6 +14,7 @@ type receivedPacketHandler struct {
highestInOrderObservedEntropy EntropyAccumulator highestInOrderObservedEntropy EntropyAccumulator
largestObserved protocol.PacketNumber largestObserved protocol.PacketNumber
packetHistory map[protocol.PacketNumber]bool // the bool is the EntropyBit of the packet packetHistory map[protocol.PacketNumber]bool // the bool is the EntropyBit of the packet
stateChanged bool // has an ACK for this state already been sent? Will be set to false every time a new packet arrives, and to false every time an ACK is sent
} }
// NewReceivedPacketHandler creates a new receivedPacketHandler // NewReceivedPacketHandler creates a new receivedPacketHandler
@ -31,6 +32,8 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
return ErrDuplicatePacket return ErrDuplicatePacket
} }
h.stateChanged = true
if packetNumber > h.largestObserved { if packetNumber > h.largestObserved {
h.largestObserved = packetNumber h.largestObserved = packetNumber
} }
@ -84,6 +87,12 @@ func (h *receivedPacketHandler) getNackRanges() ([]frames.NackRange, EntropyAccu
} }
func (h *receivedPacketHandler) DequeueAckFrame() *frames.AckFrame { func (h *receivedPacketHandler) DequeueAckFrame() *frames.AckFrame {
if !h.stateChanged {
return nil
}
h.stateChanged = false
nackRanges, entropy := h.getNackRanges() nackRanges, entropy := h.getNackRanges()
return &frames.AckFrame{ return &frames.AckFrame{
LargestObserved: h.largestObserved, LargestObserved: h.largestObserved,

49
ackhandler/received_packet_handler_test.go
View file

@ -229,4 +229,53 @@ var _ = Describe("receivedPacketHandler", func() {
Expect(ranges).To(HaveLen(0)) Expect(ranges).To(HaveLen(0))
}) })
}) })
Context("ACK package generation", func() {
It("generates a simple ACK frame", func() {
entropy := EntropyAccumulator(0)
entropy.Add(1, true)
entropy.Add(2, true)
err := handler.ReceivedPacket(protocol.PacketNumber(1), true)
Expect(err).ToNot(HaveOccurred())
err = handler.ReceivedPacket(protocol.PacketNumber(2), true)
Expect(err).ToNot(HaveOccurred())
Expect(handler.DequeueAckFrame()).To(Equal(&frames.AckFrame{LargestObserved: 2, Entropy: byte(entropy)}))
})
It("generates an ACK frame with a NACK range", func() {
entropy := EntropyAccumulator(0)
entropy.Add(1, true)
entropy.Add(4, true)
err := handler.ReceivedPacket(protocol.PacketNumber(1), true)
Expect(err).ToNot(HaveOccurred())
err = handler.ReceivedPacket(protocol.PacketNumber(4), true)
Expect(err).ToNot(HaveOccurred())
expectedAck := frames.AckFrame{
LargestObserved: 4,
Entropy: byte(entropy),
NackRanges: []frames.NackRange{frames.NackRange{FirstPacketNumber: 2, LastPacketNumber: 3}},
}
Expect(handler.DequeueAckFrame()).To(Equal(&expectedAck))
})
It("does not generate an ACK if an ACK has already been sent for the largest Packet", func() {
err := handler.ReceivedPacket(protocol.PacketNumber(1), false)
Expect(err).ToNot(HaveOccurred())
err = handler.ReceivedPacket(protocol.PacketNumber(2), false)
Expect(err).ToNot(HaveOccurred())
Expect(handler.DequeueAckFrame()).ToNot(BeNil())
Expect(handler.DequeueAckFrame()).To(BeNil())
})
It("generates an ACK when an out-of-order packet arrives", func() {
err := handler.ReceivedPacket(protocol.PacketNumber(1), false)
Expect(err).ToNot(HaveOccurred())
err = handler.ReceivedPacket(protocol.PacketNumber(3), false)
Expect(err).ToNot(HaveOccurred())
Expect(handler.DequeueAckFrame()).ToNot(BeNil())
err = handler.ReceivedPacket(protocol.PacketNumber(2), false)
Expect(err).ToNot(HaveOccurred())
Expect(handler.DequeueAckFrame()).ToNot(BeNil())
})
})
}) })