diff --git a/client.go b/client.go index 955c908eb..766d03ab5 100644 --- a/client.go +++ b/client.go @@ -347,6 +347,8 @@ func (c *client) handleVersionNegotiationPacket(hdr *wire.Header) error { } } + utils.Infof("Received a Version Negotiation Packet. Supported Versions: %s", hdr.SupportedVersions) + newVersion, ok := protocol.ChooseSupportedVersion(c.config.Versions, hdr.SupportedVersions) if !ok { return qerr.InvalidVersion diff --git a/internal/protocol/version.go b/internal/protocol/version.go index 3135ca853..a74750871 100644 --- a/internal/protocol/version.go +++ b/internal/protocol/version.go @@ -46,7 +46,7 @@ func (vn VersionNumber) String() string { if vn.isGQUIC() { return fmt.Sprintf("gQUIC %d", vn.toGQUICVersion()) } - return fmt.Sprintf("%d", vn) + return fmt.Sprintf("%#x", uint32(vn)) } } diff --git a/internal/protocol/version_test.go b/internal/protocol/version_test.go index 33c5cf38e..01de14e38 100644 --- a/internal/protocol/version_test.go +++ b/internal/protocol/version_test.go @@ -35,6 +35,7 @@ var _ = Describe("Version", func() { Expect(VersionNumber(0x51303133).String()).To(Equal("gQUIC 13")) Expect(VersionNumber(0x51303235).String()).To(Equal("gQUIC 25")) Expect(VersionNumber(0x51303438).String()).To(Equal("gQUIC 48")) + Expect(VersionNumber(0x01234567).String()).To(Equal("0x1234567")) }) It("has the right representation for the H2 Alt-Svc tag", func() { diff --git a/internal/wire/ietf_header_test.go b/internal/wire/ietf_header_test.go index 4faa54888..72ff2cba5 100644 --- a/internal/wire/ietf_header_test.go +++ b/internal/wire/ietf_header_test.go @@ -392,9 +392,9 @@ var _ = Describe("IETF draft Header", func() { Type: protocol.PacketTypeHandshake, PacketNumber: 0x1337, ConnectionID: 0xdeadbeef, - Version: 253, + Version: 0xfeed, }).logHeader() - Expect(string(buf.Bytes())).To(ContainSubstring("Long Header{Type: Handshake, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 253}")) + Expect(string(buf.Bytes())).To(ContainSubstring("Long Header{Type: Handshake, ConnectionID: 0xdeadbeef, PacketNumber: 0x1337, Version: 0xfeed}")) }) It("logs Short Headers containing a connection ID", func() {