From 5d535166cabc3dc22a1096a5369d0e98b96d8e79 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 1 Jan 2019 16:35:33 +0700
Subject: [PATCH] fix logging of coalesced packets

---
 packet_handler_map.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packet_handler_map.go b/packet_handler_map.go
index ce4c55156..6b511e58c 100644
--- a/packet_handler_map.go
+++ b/packet_handler_map.go
@@ -186,10 +186,6 @@ func (h *packetHandlerMap) parsePacket(
 	var counter int
 	var lastConnID protocol.ConnectionID
 	for len(data) > 0 {
-		if counter > 0 && h.logger.Debug() {
-			h.logger.Debugf("Parsed a coalesced packet. Part %d: %d bytes", counter, len(packets[counter-1].data))
-		}
-
 		hdr, err := wire.ParseHeader(bytes.NewReader(data), h.connIDLen)
 		// drop the packet if we can't parse the header
 		if err != nil {
@@ -221,6 +217,12 @@ func (h *packetHandlerMap) parsePacket(
 			data:       data,
 			buffer:     buffer,
 		})
+
+		// only log if this actually a coalesced packet
+		if h.logger.Debug() && (counter > 1 || len(rest) > 0) {
+			h.logger.Debugf("Parsed a coalesced packet. Part %d: %d bytes. Remaining: %d bytes.", counter, len(packets[counter-1].data), len(rest))
+		}
+
 		data = rest
 	}
 	return packets, nil