handle gQUIC and IETF QUIC packets separately in the client

internal/wire/header.go

@@ -10,6 +10,8 @@ import (
 // Header is the header of a QUIC packet.
 // It contains fields that are only needed for the gQUIC Public Header and the IETF draft Header.
 type Header struct {
+	IsPublicHeader bool
+
 	Raw []byte
 
 	Version protocol.VersionNumber
@@ -34,9 +36,6 @@ type Header struct {
 	IsLongHeader bool
 	KeyPhase     int
 	PayloadLen   protocol.ByteCount
-
-	// only needed for logging
-	isPublicHeader bool
 }
 
 // ParseHeaderSentByServer parses the header for a packet that was sent by the server.
@@ -85,7 +84,7 @@ func parsePacketHeader(b *bytes.Reader, sentBy protocol.Perspective, isPublicHea
 		if err != nil {
 			return nil, err
 		}
-		hdr.isPublicHeader = true // save that this is a Public Header, so we can log it correctly later
+		hdr.IsPublicHeader = true // save that this is a Public Header, so we can log it correctly later
 		return hdr, nil
 	}
 	return parseHeader(b, sentBy)
@@ -94,7 +93,7 @@ func parsePacketHeader(b *bytes.Reader, sentBy protocol.Perspective, isPublicHea
 // Write writes the Header.
 func (h *Header) Write(b *bytes.Buffer, pers protocol.Perspective, version protocol.VersionNumber) error {
 	if !version.UsesTLS() {
-		h.isPublicHeader = true // save that this is a Public Header, so we can log it correctly later
+		h.IsPublicHeader = true // save that this is a Public Header, so we can log it correctly later
 		return h.writePublicHeader(b, pers, version)
 	}
 	return h.writeHeader(b)
@@ -110,7 +109,7 @@ func (h *Header) GetLength(pers protocol.Perspective, version protocol.VersionNu
 
 // Log logs the Header
 func (h *Header) Log(logger utils.Logger) {
-	if h.isPublicHeader {
+	if h.IsPublicHeader {
 		h.logPublicHeader(logger)
 	} else {
 		h.logHeader(logger)

internal/wire/header_test.go

@@ -35,7 +35,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(hdr.KeyPhase).To(BeEquivalentTo(1))
 			Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0x42)))
-			Expect(hdr.isPublicHeader).To(BeFalse())
+			Expect(hdr.IsPublicHeader).To(BeFalse())
 		})
 
 		It("parses an IETF draft header, when the version is not known, but it has Long Header format", func() {
@@ -53,7 +53,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(hdr.Type).To(Equal(protocol.PacketType0RTT))
 			Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0x42)))
-			Expect(hdr.isPublicHeader).To(BeFalse())
+			Expect(hdr.IsPublicHeader).To(BeFalse())
 			Expect(hdr.Version).To(Equal(protocol.VersionNumber(0x1234)))
 		})
 
@@ -70,7 +70,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			hdr, err := ParseHeaderSentByServer(bytes.NewReader(buf.Bytes()), versionIETFHeader)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(hdr.isPublicHeader).To(BeFalse())
+			Expect(hdr.IsPublicHeader).To(BeFalse())
 		})
 
 		It("parses a gQUIC Public Header, when the version is not known", func() {
@@ -91,7 +91,7 @@ var _ = Describe("Header", func() {
 			Expect(hdr.SrcConnectionID).To(Equal(connID))
 			Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0x1337)))
 			Expect(hdr.Version).To(Equal(versionPublicHeader))
-			Expect(hdr.isPublicHeader).To(BeTrue())
+			Expect(hdr.IsPublicHeader).To(BeTrue())
 		})
 
 		It("parses a gQUIC Public Header, when the version is known", func() {
@@ -111,7 +111,7 @@ var _ = Describe("Header", func() {
 			Expect(hdr.SrcConnectionID).To(Equal(connID))
 			Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0x1337)))
 			Expect(hdr.DiversificationNonce).To(HaveLen(32))
-			Expect(hdr.isPublicHeader).To(BeTrue())
+			Expect(hdr.IsPublicHeader).To(BeTrue())
 		})
 
 		It("errors when parsing the gQUIC header fails", func() {
@@ -142,7 +142,7 @@ var _ = Describe("Header", func() {
 			data := ComposeGQUICVersionNegotiation(connID, versions)
 			hdr, err := ParseHeaderSentByServer(bytes.NewReader(data), protocol.VersionUnknown)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(hdr.isPublicHeader).To(BeTrue())
+			Expect(hdr.IsPublicHeader).To(BeTrue())
 			Expect(hdr.DestConnectionID).To(Equal(connID))
 			Expect(hdr.SrcConnectionID).To(Equal(connID))
 			// in addition to the versions, the supported versions might contain a reserved version number
@@ -159,7 +159,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			hdr, err := ParseHeaderSentByServer(bytes.NewReader(data), protocol.VersionUnknown)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(hdr.isPublicHeader).To(BeFalse())
+			Expect(hdr.IsPublicHeader).To(BeFalse())
 			Expect(hdr.IsVersionNegotiation).To(BeTrue())
 			Expect(hdr.DestConnectionID).To(Equal(destConnID))
 			Expect(hdr.SrcConnectionID).To(Equal(srcConnID))
@@ -184,7 +184,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			_, err = parsePublicHeader(bytes.NewReader(buf.Bytes()), protocol.PerspectiveServer)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(hdr.isPublicHeader).To(BeTrue())
+			Expect(hdr.IsPublicHeader).To(BeTrue())
 		})
 
 		It("writes a IETF draft header", func() {
@@ -200,7 +200,7 @@ var _ = Describe("Header", func() {
 			Expect(err).ToNot(HaveOccurred())
 			_, err = parseHeader(bytes.NewReader(buf.Bytes()), protocol.PerspectiveServer)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(hdr.isPublicHeader).To(BeFalse())
+			Expect(hdr.IsPublicHeader).To(BeFalse())
 		})
 	})
 
@@ -278,7 +278,7 @@ var _ = Describe("Header", func() {
 
 		It("logs a Public Header", func() {
 			(&Header{
-				isPublicHeader:   true,
+				IsPublicHeader:   true,
 				DestConnectionID: protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8},
 				SrcConnectionID:  protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8},
 			}).Log(logger)