From 673b2ddad3c292c640cf8e6f0af7db9977e2c90a Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 30 Mar 2020 10:57:11 +0700
Subject: [PATCH] qlog sending of packets before logging packet-related events

When we send a packet, we might set a loss detection timer. The log will
be easier to interpret if the log loss_timer_updated event comes after
the packet_sent event.
---
 session.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/session.go b/session.go
index c6d1faf92..792cf244d 100644
--- a/session.go
+++ b/session.go
@@ -1363,6 +1363,7 @@ func (s *session) sendPacket() (bool, error) {
 		if err != nil || packet == nil {
 			return false, err
 		}
+		s.logCoalescedPacket(now, packet)
 		for _, p := range packet.packets {
 			if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && p.IsAckEliciting() {
 				s.firstAckElicitingPacketAfterIdleSentTime = now
@@ -1370,7 +1371,6 @@ func (s *session) sendPacket() (bool, error) {
 			s.sentPacketHandler.SentPacket(p.ToAckHandlerPacket(now, s.retransmissionQueue))
 		}
 		s.connIDManager.SentPacket()
-		s.logCoalescedPacket(now, packet)
 		s.sendQueue.Send(packet.buffer)
 		return true, nil
 	}
@@ -1387,9 +1387,9 @@ func (s *session) sendPackedPacket(packet *packedPacket) {
 	if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && packet.IsAckEliciting() {
 		s.firstAckElicitingPacketAfterIdleSentTime = now
 	}
+	s.logPacket(now, packet)
 	s.sentPacketHandler.SentPacket(packet.ToAckHandlerPacket(time.Now(), s.retransmissionQueue))
 	s.connIDManager.SentPacket()
-	s.logPacket(now, packet)
 	s.sendQueue.Send(packet.buffer)
 }