From 867b1f6015395dd7e1c4ee9530c1d22b23cdb200 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 29 Oct 2016 01:48:54 +0700 Subject: [PATCH] remove unused largestInOrderObserved from ReceivedPacketHandler --- ackhandler/received_packet_handler.go | 18 ++++-------------- ackhandler/received_packet_handler_test.go | 18 ------------------ 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/ackhandler/received_packet_handler.go b/ackhandler/received_packet_handler.go index 55dc9425..94ca14d7 100644 --- a/ackhandler/received_packet_handler.go +++ b/ackhandler/received_packet_handler.go @@ -25,11 +25,10 @@ var ( ) type receivedPacketHandler struct { - largestInOrderObserved protocol.PacketNumber - largestObserved protocol.PacketNumber - ignorePacketsBelow protocol.PacketNumber - currentAckFrame *frames.AckFrame - 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 + largestObserved protocol.PacketNumber + ignorePacketsBelow protocol.PacketNumber + currentAckFrame *frames.AckFrame + 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 packetHistory *receivedPacketHistory @@ -72,10 +71,6 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe h.largestObserved = packetNumber } - if packetNumber == h.largestInOrderObserved+1 { - h.largestInOrderObserved = packetNumber - } - h.receivedTimes[packetNumber] = time.Now() if len(h.receivedTimes) > protocol.MaxTrackedReceivedPackets { @@ -94,11 +89,6 @@ func (h *receivedPacketHandler) ReceivedStopWaiting(f *frames.StopWaitingFrame) h.ignorePacketsBelow = f.LeastUnacked - 1 h.garbageCollectReceivedTimes() - // 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 - if f.LeastUnacked > h.largestInOrderObserved { - h.largestInOrderObserved = f.LeastUnacked - 1 - } - h.packetHistory.DeleteBelow(f.LeastUnacked) return nil diff --git a/ackhandler/received_packet_handler_test.go b/ackhandler/received_packet_handler_test.go index 2ac2c4c4..6109efd6 100644 --- a/ackhandler/received_packet_handler_test.go +++ b/ackhandler/received_packet_handler_test.go @@ -53,7 +53,6 @@ var _ = Describe("receivedPacketHandler", func() { Expect(err).ToNot(HaveOccurred()) err = handler.ReceivedPacket(9) Expect(err).To(MatchError(ErrPacketSmallerThanLastStopWaiting)) - Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(9))) }) It("does not ignore a packet with PacketNumber equal to LeastUnacked of a previously received StopWaiting", func() { @@ -63,7 +62,6 @@ var _ = Describe("receivedPacketHandler", func() { Expect(err).ToNot(HaveOccurred()) err = handler.ReceivedPacket(10) Expect(err).ToNot(HaveOccurred()) - Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(10))) }) It("saves the time when each packet arrived", func() { @@ -99,20 +97,6 @@ var _ = Describe("receivedPacketHandler", func() { }) Context("handling STOP_WAITING frames", 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 { - continue - } - err := handler.ReceivedPacket(protocol.PacketNumber(i)) - Expect(err).ToNot(HaveOccurred()) - } - err := handler.ReceivedStopWaiting(&frames.StopWaitingFrame{LeastUnacked: protocol.PacketNumber(12)}) - Expect(err).ToNot(HaveOccurred()) - Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(11))) - }) - It("increases the ignorePacketsBelow number", func() { err := handler.ReceivedStopWaiting(&frames.StopWaitingFrame{LeastUnacked: protocol.PacketNumber(12)}) Expect(err).ToNot(HaveOccurred()) @@ -124,7 +108,6 @@ var _ = Describe("receivedPacketHandler", func() { err := handler.ReceivedPacket(protocol.PacketNumber(i)) Expect(err).ToNot(HaveOccurred()) } - Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(19))) err := handler.ReceivedStopWaiting(&frames.StopWaitingFrame{LeastUnacked: protocol.PacketNumber(12)}) Expect(err).ToNot(HaveOccurred()) Expect(handler.ignorePacketsBelow).To(Equal(protocol.PacketNumber(11))) @@ -260,7 +243,6 @@ var _ = Describe("receivedPacketHandler", func() { } err := handler.ReceivedStopWaiting(&frames.StopWaitingFrame{LeastUnacked: protocol.PacketNumber(6)}) Expect(err).ToNot(HaveOccurred()) - Expect(handler.largestInOrderObserved).To(Equal(protocol.PacketNumber(12))) // check that the packets were deleted from the receivedPacketHistory by checking the values in an ACK frame ack, err := handler.GetAckFrame(true) Expect(err).ToNot(HaveOccurred())