gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1613 from lucas-clemente/remove-pnlen-6

Browse Source 
remove 6 byte packet numbers
This commit is contained in:
Marten Seemann
2018-11-19 20:45:42 +07:00
committed by GitHub
parent 4f24750c6b 7696bf59ea
commit 590df11604
5 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integrationtests/tools/proxy/proxy_test.go
View File

@@ -24,7 +24,7 @@ var _ = Describe("QUIC Proxy", func() {
b := &bytes.Buffer{} b := &bytes.Buffer{}
hdr := wire.Header{ hdr := wire.Header{
PacketNumber: p, PacketNumber: p,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen4,
DestConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37}, DestConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37},
SrcConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37}, SrcConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef, 0, 0, 0x13, 0x37},
} }

5
internal/protocol/packet_number.go
View File

@@ -58,8 +58,5 @@ func GetPacketNumberLength(packetNumber PacketNumber) PacketNumberLen {
if packetNumber < (1 << (uint8(PacketNumberLen2) * 8)) { if packetNumber < (1 << (uint8(PacketNumberLen2) * 8)) {
return PacketNumberLen2 return PacketNumberLen2
} }
if packetNumber < (1 << (uint8(PacketNumberLen4) * 8)) { return PacketNumberLen4
return PacketNumberLen4
}
return PacketNumberLen6
} }

4
internal/protocol/packet_number_test.go
View File

@@ -228,9 +228,5 @@ var _ = Describe("packet number calculation", func() {
It("4 byte", func() { It("4 byte", func() {
Expect(GetPacketNumberLength(0xFFFFFFFF)).To(Equal(PacketNumberLen4)) Expect(GetPacketNumberLength(0xFFFFFFFF)).To(Equal(PacketNumberLen4))
}) })
It("6 byte", func() {
Expect(GetPacketNumberLength(0xFFFFFFFFFFFF)).To(Equal(PacketNumberLen6))
})
}) })
}) })

2
internal/protocol/protocol.go
View File

@@ -19,8 +19,6 @@ const (
PacketNumberLen2 PacketNumberLen = 2 PacketNumberLen2 PacketNumberLen = 2
// PacketNumberLen4 is a packet number length of 4 bytes // PacketNumberLen4 is a packet number length of 4 bytes
PacketNumberLen4 PacketNumberLen = 4 PacketNumberLen4 PacketNumberLen = 4
// PacketNumberLen6 is a packet number length of 6 bytes
PacketNumberLen6 PacketNumberLen = 6
) )
// The PacketType is the Long Header Type // The PacketType is the Long Header Type

2
session_test.go
View File

@@ -453,7 +453,7 @@ var _ = Describe("Session", func() {
BeforeEach(func() { BeforeEach(func() {
unpacker = NewMockUnpacker(mockCtrl) unpacker = NewMockUnpacker(mockCtrl)
sess.unpacker = unpacker sess.unpacker = unpacker
hdr = &wire.Header{PacketNumberLen: protocol.PacketNumberLen6} hdr = &wire.Header{PacketNumberLen: protocol.PacketNumberLen4}
}) })
It("sets the {last,largest}RcvdPacketNumber", func() { It("sets the {last,largest}RcvdPacketNumber", func() {