From a8ddba6a39696e4c682a405e596a701c05018329 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 18 Jun 2020 11:28:43 +0700 Subject: [PATCH] remove unused packet counter in the receivedPacketTracker --- internal/ackhandler/received_packet_tracker.go | 4 ---- internal/ackhandler/received_packet_tracker_test.go | 1 - 2 files changed, 5 deletions(-) diff --git a/internal/ackhandler/received_packet_tracker.go b/internal/ackhandler/received_packet_tracker.go index b2c060842..c6fc57c9e 100644 --- a/internal/ackhandler/received_packet_tracker.go +++ b/internal/ackhandler/received_packet_tracker.go @@ -22,7 +22,6 @@ type receivedPacketTracker struct { hasNewAck bool // true as soon as we received an ack-eliciting new packet ackQueued bool // true once we received more than 2 (or later in the connection 10) ack-eliciting packets - packetsReceivedSinceLastAck int ackElicitingPacketsReceivedSinceLastAck int ackAlarm time.Time lastAck *wire.AckFrame @@ -96,8 +95,6 @@ func (h *receivedPacketTracker) hasNewMissingPackets() bool { // It is implemented analogously to Chrome's QuicConnection::MaybeQueueAck() // in ACK_DECIMATION_WITH_REORDERING mode. func (h *receivedPacketTracker) maybeQueueAck(packetNumber protocol.PacketNumber, rcvTime time.Time, shouldInstigateAck, wasMissing bool) { - h.packetsReceivedSinceLastAck++ - // always ack the first packet if h.lastAck == nil { if !h.ackQueued { @@ -194,7 +191,6 @@ func (h *receivedPacketTracker) GetAckFrame(onlyIfQueued bool) *wire.AckFrame { h.ackAlarm = time.Time{} h.ackQueued = false h.hasNewAck = false - h.packetsReceivedSinceLastAck = 0 h.ackElicitingPacketsReceivedSinceLastAck = 0 return ack } diff --git a/internal/ackhandler/received_packet_tracker_test.go b/internal/ackhandler/received_packet_tracker_test.go index 0d6f22271..fab8c7000 100644 --- a/internal/ackhandler/received_packet_tracker_test.go +++ b/internal/ackhandler/received_packet_tracker_test.go @@ -328,7 +328,6 @@ var _ = Describe("Received Packet Tracker", func() { tracker.ReceivedPacket(1, time.Time{}, true) tracker.ackAlarm = time.Now().Add(-time.Minute) Expect(tracker.GetAckFrame(true)).ToNot(BeNil()) - Expect(tracker.packetsReceivedSinceLastAck).To(BeZero()) Expect(tracker.GetAlarmTimeout()).To(BeZero()) Expect(tracker.ackElicitingPacketsReceivedSinceLastAck).To(BeZero()) Expect(tracker.ackQueued).To(BeFalse())