From 93c52a341428ab61ed3015856f0b427da99fa721 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Sun, 15 May 2016 19:58:34 +0200 Subject: [PATCH] fix support for version 30 fixes #101, ref #70 --- public_header.go | 5 +++-- public_header_test.go | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public_header.go b/public_header.go index cd3d07a8..f3326d8b 100644 --- a/public_header.go +++ b/public_header.go @@ -32,7 +32,7 @@ type publicHeader struct { // WritePublicHeader writes a public header func (h *publicHeader) WritePublicHeader(b *bytes.Buffer) error { - publicFlagByte := uint8(0x04) + publicFlagByte := uint8(0x00) if h.VersionFlag && h.ResetFlag { return errResetAndVersionFlagSet } @@ -43,7 +43,8 @@ func (h *publicHeader) WritePublicHeader(b *bytes.Buffer) error { publicFlagByte |= 0x02 } if !h.TruncateConnectionID { - publicFlagByte |= 0x08 + // TODO: Change this once we support version 33 properly + publicFlagByte |= 0x0c } if !h.ResetFlag && !h.VersionFlag { diff --git a/public_header_test.go b/public_header_test.go index 01ba1488..6ccb636a 100644 --- a/public_header_test.go +++ b/public_header_test.go @@ -140,12 +140,11 @@ var _ = Describe("Public Header", func() { ConnectionID: 0x4cfa9f9b668619f6, TruncateConnectionID: true, PacketNumberLen: protocol.PacketNumberLen6, + PacketNumber: 1, } err := hdr.WritePublicHeader(b) Expect(err).ToNot(HaveOccurred()) - firstByte, _ := b.ReadByte() - Expect(firstByte & 0x08).To(BeZero()) - Expect(b.Bytes()).ToNot(ContainSubstring(string([]byte{0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c}))) + Expect(b.Bytes()).To(Equal([]byte{0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0})) }) Context("GetLength", func() {