From 7696bf59ea69457b1c62693b8ee8922f3c649477 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 19 Nov 2018 16:03:41 +0700
Subject: [PATCH] remove 6 byte packet numbers

---
 integrationtests/tools/proxy/proxy_test.go | 2 +-
 internal/protocol/packet_number.go         | 5 +----
 internal/protocol/packet_number_test.go    | 4 ----
 internal/protocol/protocol.go              | 2 --
 session_test.go                            | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/integrationtests/tools/proxy/proxy_test.go b/integrationtests/tools/proxy/proxy_test.go
index 945a9c48d..03c9fed39 100644
--- a/integrationtests/tools/proxy/proxy_test.go
+++ b/integrationtests/tools/proxy/proxy_test.go
@@ -24,7 +24,7 @@ var _ = Describe("QUIC Proxy", func() {
 		b := &bytes.Buffer{}
 		hdr := wire.Header{
 			PacketNumber:     p,
-			PacketNumberLen:  protocol.PacketNumberLen6,
+			PacketNumberLen:  protocol.PacketNumberLen4,
 			DestConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37},
 			SrcConnectionID:  protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37},
 		}
diff --git a/internal/protocol/packet_number.go b/internal/protocol/packet_number.go
index 3b749b48b..e32d6baa9 100644
--- a/internal/protocol/packet_number.go
+++ b/internal/protocol/packet_number.go
@@ -58,8 +58,5 @@ func GetPacketNumberLength(packetNumber PacketNumber) PacketNumberLen {
 	if packetNumber < (1 << (uint8(PacketNumberLen2) * 8)) {
 		return PacketNumberLen2
 	}
-	if packetNumber < (1 << (uint8(PacketNumberLen4) * 8)) {
-		return PacketNumberLen4
-	}
-	return PacketNumberLen6
+	return PacketNumberLen4
 }
diff --git a/internal/protocol/packet_number_test.go b/internal/protocol/packet_number_test.go
index 98ebbc1af..6d23d7a30 100644
--- a/internal/protocol/packet_number_test.go
+++ b/internal/protocol/packet_number_test.go
@@ -228,9 +228,5 @@ var _ = Describe("packet number calculation", func() {
 		It("4 byte", func() {
 			Expect(GetPacketNumberLength(0xFFFFFFFF)).To(Equal(PacketNumberLen4))
 		})
-
-		It("6 byte", func() {
-			Expect(GetPacketNumberLength(0xFFFFFFFFFFFF)).To(Equal(PacketNumberLen6))
-		})
 	})
 })
diff --git a/internal/protocol/protocol.go b/internal/protocol/protocol.go
index 327786c84..c102691a4 100644
--- a/internal/protocol/protocol.go
+++ b/internal/protocol/protocol.go
@@ -19,8 +19,6 @@ const (
 	PacketNumberLen2 PacketNumberLen = 2
 	// PacketNumberLen4 is a packet number length of 4 bytes
 	PacketNumberLen4 PacketNumberLen = 4
-	// PacketNumberLen6 is a packet number length of 6 bytes
-	PacketNumberLen6 PacketNumberLen = 6
 )
 
 // The PacketType is the Long Header Type
diff --git a/session_test.go b/session_test.go
index 675e2eb9d..cb421a476 100644
--- a/session_test.go
+++ b/session_test.go
@@ -453,7 +453,7 @@ var _ = Describe("Session", func() {
 		BeforeEach(func() {
 			unpacker = NewMockUnpacker(mockCtrl)
 			sess.unpacker = unpacker
-			hdr = &wire.Header{PacketNumberLen: protocol.PacketNumberLen6}
+			hdr = &wire.Header{PacketNumberLen: protocol.PacketNumberLen4}
 		})
 
 		It("sets the {last,largest}RcvdPacketNumber", func() {