log tokens in NEW_TOKEN frames, Retry packets and Initial packets

qlog/packet_header_test.go

@@ -69,6 +69,52 @@ var _ = Describe("Packet Header", func() {
 			)
 		})
 
+		It("marshals an Initial with a token", func() {
+			check(
+				&wire.ExtendedHeader{
+					PacketNumber: 4242,
+					Header: wire.Header{
+						IsLongHeader: true,
+						Type:         protocol.PacketTypeInitial,
+						Length:       123,
+						Version:      protocol.VersionNumber(0xdecafbad),
+						Token:        []byte{0xde, 0xad, 0xbe, 0xef},
+					},
+				},
+				map[string]interface{}{
+					"packet_type":    "initial",
+					"packet_number":  4242,
+					"payload_length": 123,
+					"dcil":           0,
+					"scil":           0,
+					"version":        "decafbad",
+					"token":          map[string]interface{}{"data": "deadbeef"},
+				},
+			)
+		})
+
+		It("marshals a Retry packet", func() {
+			check(
+				&wire.ExtendedHeader{
+					Header: wire.Header{
+						IsLongHeader:    true,
+						Type:            protocol.PacketTypeRetry,
+						SrcConnectionID: protocol.ConnectionID{0x11, 0x22, 0x33, 0x44},
+						Version:         protocol.VersionNumber(0xdecafbad),
+						Token:           []byte{0xde, 0xad, 0xbe, 0xef},
+					},
+				},
+				map[string]interface{}{
+					"packet_type": "retry",
+					"dcil":        0,
+					"scil":        4,
+					"scid":        "11223344",
+					"token":       map[string]interface{}{"data": "deadbeef"},
+					"version":     "decafbad",
+				},
+			)
+		})
+
 		It("marshals a packet with packet number 0", func() {
 			check(
 				&wire.ExtendedHeader{