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

rename highestInOrderObserved to largestInOrderObserved in new ReceivedPacketHanlder

Browse Source
This commit is contained in:
Marten Seemann
2016-07-03 21:55:57 +08:00
parent 1186af3f99
commit 0ebab92ae1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ackhandlernew/received_packet_handler.go
View File

@@ -18,7 +18,7 @@ var (
)
type receivedPacketHandler struct {
highestInOrderObserved protocol.PacketNumber
largestInOrderObserved protocol.PacketNumber
largestObserved protocol.PacketNumber
currentAckFrame *frames.AckFrameNew
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
@@ -41,7 +41,7 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
return errInvalidPacketNumber
}
_, ok := h.receivedTimes[packetNumber]
if packetNumber <= h.highestInOrderObserved || ok {
if packetNumber <= h.largestInOrderObserved || ok {
return ErrDuplicatePacket
}
@@ -54,8 +54,8 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
h.largestObserved = packetNumber
}
if packetNumber == h.highestInOrderObserved+1 {
h.highestInOrderObserved = packetNumber
if packetNumber == h.largestInOrderObserved+1 {
h.largestInOrderObserved = packetNumber
}
h.receivedTimes[packetNumber] = time.Now()
@@ -71,12 +71,12 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
func (h *receivedPacketHandler) ReceivedStopWaiting(f *frames.StopWaitingFrame) error {
// Ignore if STOP_WAITING is unneeded
if h.highestInOrderObserved >= f.LeastUnacked {
if h.largestInOrderObserved >= f.LeastUnacked {
return nil
}
// the LeastUnacked is the smallest packet number of any packet for which the sender is still awaiting an ack. So the highestInOrderObserved is one less than that
h.highestInOrderObserved = f.LeastUnacked - 1
// the LeastUnacked is the smallest packet number of any packet for which the sender is still awaiting an ack. So the largestInOrderObserved is one less than that
h.largestInOrderObserved = f.LeastUnacked - 1
h.packetHistory.DeleteBelow(f.LeastUnacked)
@@ -118,8 +118,8 @@ func (h *receivedPacketHandler) GetAckFrame(dequeue bool) (*frames.AckFrameNew,
}
func (h *receivedPacketHandler) garbageCollect() {
for i := h.lowestInReceivedTimes; i < h.highestInOrderObserved; i++ {
for i := h.lowestInReceivedTimes; i < h.largestInOrderObserved; i++ {
delete(h.receivedTimes, i)
}
h.lowestInReceivedTimes = h.highestInOrderObserved
h.lowestInReceivedTimes = h.largestInOrderObserved
}

4
ackhandlernew/received_packet_handler_test.go
View File

@@ -74,7 +74,7 @@ var _ = Describe("receivedPacketHandler", func() {
})
Context("handling STOP_WAITING frames", func() {
It("increases the highestInOrderObserved packet number", func() {
It("increases the largestInOrderObserved packet number", func() {
// We simulate 20 packets, numbers 10, 11 and 12 lost
for i := 1; i < 20; i++ {
if i == 10 || i == 11 || i == 12 {
@@ -85,7 +85,7 @@ var _ = Describe("receivedPacketHandler", func() {
}
err := handler.ReceivedStopWaiting(&frames.StopWaitingFrame{LeastUnacked: protocol.PacketNumber(12)})
Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderObserved).To(Equal(protocol.PacketNumber(11)))
Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(11)))
})
})