From 1ceb7fc4e08a88d98ba418788f2206df2d0c88da Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Fri, 12 Aug 2016 21:27:41 +0200 Subject: [PATCH] fix retransmission logging in sent packet handlers --- ackhandler/sent_packet_handler.go | 4 ++-- ackhandlerlegacy/sent_packet_handler.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ackhandler/sent_packet_handler.go b/ackhandler/sent_packet_handler.go index 4bd9a9e1..7c9414a1 100644 --- a/ackhandler/sent_packet_handler.go +++ b/ackhandler/sent_packet_handler.go @@ -89,6 +89,7 @@ func (h *sentPacketHandler) nackPacket(packetElement *ackhandlerlegacy.PacketEle packet.MissingReports++ if packet.MissingReports > protocol.RetransmissionThreshold { + utils.Debugf("\tQueueing packet 0x%x for retransmission (fast)", packet.PacketNumber) h.queuePacketForRetransmission(packetElement) return packet, nil } @@ -98,7 +99,6 @@ func (h *sentPacketHandler) nackPacket(packetElement *ackhandlerlegacy.PacketEle // does NOT set packet.Retransmitted. This variable is not needed anymore func (h *sentPacketHandler) queuePacketForRetransmission(packetElement *ackhandlerlegacy.PacketElement) { packet := &packetElement.Value - utils.Debugf("\tQueueing packet 0x%x for retransmission", packet.PacketNumber) h.bytesInFlight -= packet.Length h.retransmissionQueue = append(h.retransmissionQueue, packet) @@ -327,7 +327,7 @@ func (h *sentPacketHandler) maybeQueuePacketsRTO() { }} h.congestion.OnCongestionEvent(false, h.BytesInFlight(), nil, packetsLost) h.congestion.OnRetransmissionTimeout(true) - // utils.Debugf("\tqueueing RTO retransmission for packet 0x%x", packet.PacketNumber) + utils.Debugf("\tQueueing packet 0x%x for retransmission (RTO)", packet.PacketNumber) h.queuePacketForRetransmission(el) return } diff --git a/ackhandlerlegacy/sent_packet_handler.go b/ackhandlerlegacy/sent_packet_handler.go index 8ea5efe0..42e21d64 100644 --- a/ackhandlerlegacy/sent_packet_handler.go +++ b/ackhandlerlegacy/sent_packet_handler.go @@ -98,6 +98,7 @@ func (h *sentPacketHandler) nackPacket(packetNumber protocol.PacketNumber) (*Pac packet.MissingReports++ if packet.MissingReports > protocol.RetransmissionThreshold { + utils.Debugf("\tQueueing packet 0x%x for retransmission (fast)", packet.PacketNumber) h.queuePacketForRetransmission(packet) return packet, nil } @@ -341,6 +342,7 @@ func (h *sentPacketHandler) maybeQueuePacketsRTO() { }} h.congestion.OnCongestionEvent(false, h.BytesInFlight(), nil, packetsLost) h.congestion.OnRetransmissionTimeout(true) + utils.Debugf("\tQueueing packet 0x%x for retransmission (RTO)", packet.PacketNumber) h.queuePacketForRetransmission(packet) return }