From 704bd784451330475418d2ff4425bb8d0841a0e7 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 9 Sep 2020 13:17:59 +0700
Subject: [PATCH] move the PacketHeader struct from logging to qlog package

---
 logging/packet_header.go | 15 ---------------
 qlog/packet_header.go    | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/logging/packet_header.go b/logging/packet_header.go
index 287e0cc56..ea4282fe3 100644
--- a/logging/packet_header.go
+++ b/logging/packet_header.go
@@ -25,18 +25,3 @@ func PacketTypeFromHeader(hdr *Header) PacketType {
 		return PacketTypeNotDetermined
 	}
 }
-
-// PacketHeader is a QUIC packet header.
-type PacketHeader struct {
-	PacketType PacketType
-
-	PacketNumber  PacketNumber
-	PayloadLength ByteCount
-	// Size of the QUIC packet (QUIC header + payload).
-	// See https://github.com/quiclog/internet-drafts/issues/40.
-	PacketSize ByteCount
-
-	Version          VersionNumber
-	SrcConnectionID  ConnectionID
-	DestConnectionID ConnectionID
-}
diff --git a/qlog/packet_header.go b/qlog/packet_header.go
index de564aaf9..8d324f029 100644
--- a/qlog/packet_header.go
+++ b/qlog/packet_header.go
@@ -24,6 +24,21 @@ func getPacketTypeFromEncryptionLevel(encLevel protocol.EncryptionLevel) packetT
 	return packetType(t)
 }
 
+// PacketHeader is a QUIC packet header.
+type packetHeader struct {
+	PacketType logging.PacketType
+
+	PacketNumber  logging.PacketNumber
+	PayloadLength logging.ByteCount
+	// Size of the QUIC packet (QUIC header + payload).
+	// See https://github.com/quiclog/internet-drafts/issues/40.
+	PacketSize logging.ByteCount
+
+	Version          logging.VersionNumber
+	SrcConnectionID  logging.ConnectionID
+	DestConnectionID logging.ConnectionID
+}
+
 func transformHeader(hdr *wire.Header) *packetHeader {
 	return &packetHeader{
 		PacketType:       logging.PacketTypeFromHeader(hdr),
@@ -40,9 +55,6 @@ func transformExtendedHeader(hdr *wire.ExtendedHeader) *packetHeader {
 	return h
 }
 
-// We don't log the packet type as a part of the header yet, see https://github.com/quiclog/internet-drafts/issues/40.
-type packetHeader logging.PacketHeader
-
 func (h packetHeader) MarshalJSONObject(enc *gojay.Encoder) {
 	if h.PacketType != logging.PacketTypeRetry && h.PacketType != logging.PacketTypeVersionNegotiation {
 		enc.Int64Key("packet_number", int64(h.PacketNumber))