Merge pull request #956 from lucas-clemente/packet-type-names

add a string representation for the Long Header packet types

internal/protocol/protocol.go

@@ -1,6 +1,9 @@
 package protocol
 
-import "math"
+import (
+	"fmt"
+	"math"
+)
 
 // A PacketNumber in QUIC
 type PacketNumber uint64
@@ -37,6 +40,23 @@ const (
 	PacketType0RTT PacketType = 5
 )
 
+func (t PacketType) String() string {
+	switch t {
+	case PacketTypeVersionNegotiation:
+		return "Version Negotiation"
+	case PacketTypeInitial:
+		return "Initial"
+	case PacketTypeRetry:
+		return "Retry"
+	case PacketTypeHandshake:
+		return "Handshake"
+	case PacketType0RTT:
+		return "0-RTT Protected"
+	default:
+		return fmt.Sprintf("unknown packet type: %d", t)
+	}
+}
+
 // A ConnectionID in QUIC
 type ConnectionID uint64
 

internal/protocol/protocol_test.go

@@ -0,0 +1,19 @@
+package protocol
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Protocol", func() {
+	Context("Long Header Packet Types", func() {
+		It("has the correct string representation", func() {
+			Expect(PacketTypeVersionNegotiation.String()).To(Equal("Version Negotiation"))
+			Expect(PacketTypeInitial.String()).To(Equal("Initial"))
+			Expect(PacketTypeRetry.String()).To(Equal("Retry"))
+			Expect(PacketTypeHandshake.String()).To(Equal("Handshake"))
+			Expect(PacketType0RTT.String()).To(Equal("0-RTT Protected"))
+			Expect(PacketType(10).String()).To(Equal("unknown packet type: 10"))
+		})
+	})
+})

internal/wire/ietf_header.go

@@ -159,7 +159,7 @@ func (h *Header) getHeaderLength() (protocol.ByteCount, error) {
 
 func (h *Header) logHeader() {
 	if h.IsLongHeader {
-		utils.Debugf("   Long Header{Type: %#x, ConnectionID: %#x, PacketNumber: %#x, Version: %s}", h.Type, h.ConnectionID, h.PacketNumber, h.Version)
+		utils.Debugf("   Long Header{Type: %s, ConnectionID: %#x, PacketNumber: %#x, Version: %s}", h.Type, h.ConnectionID, h.PacketNumber, h.Version)
 	} else {
 		connID := "(omitted)"
 		if !h.OmitConnectionID {

internal/wire/ietf_header_test.go

@@ -389,12 +389,12 @@ var _ = Describe("IETF draft Header", func() {
 		It("logs Long Headers", func() {
 			(&Header{
 				IsLongHeader: true,
-				Type:         0x5,
+				Type:         protocol.PacketTypeHandshake,
 				PacketNumber: 0x1337,
 				ConnectionID: 0xdeadbeef,
 				Version:      253,
 			}).logHeader()
-			Expect(string(buf.Bytes())).To(ContainSubstring("Long Header{Type: 0x5, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 253}"))
+			Expect(string(buf.Bytes())).To(ContainSubstring("Long Header{Type: Handshake, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 253}"))
 		})
 
 		It("logs Short Headers containing a connection ID", func() {