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

implement sending of shortened packet numbers

Browse Source
This commit is contained in:
Marten Seemann
2016-05-09 23:03:04 +07:00
parent 7609246b45
commit 7169584ff9
11 changed files with 368 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packet_packer_test.go
View File

@@ -2,7 +2,9 @@ package quic
import (
"bytes"
"time"
"github.com/lucas-clemente/quic-go/ackhandler"
"github.com/lucas-clemente/quic-go/crypto"
"github.com/lucas-clemente/quic-go/frames"
"github.com/lucas-clemente/quic-go/handshake"
@@ -11,6 +13,32 @@ import (
. "github.com/onsi/gomega"
)
type mockSentPacketHandler struct{}
func (h *mockSentPacketHandler) SentPacket(packet *ackhandler.Packet) error {
return nil
}
func (h *mockSentPacketHandler) ReceivedAck(ackFrame *frames.AckFrame) (time.Duration, []*ackhandler.Packet, []*ackhandler.Packet, error) {
return 0, nil, nil, nil
}
func (h *mockSentPacketHandler) DequeuePacketForRetransmission() (packet *ackhandler.Packet) {
return nil
}
func (h *mockSentPacketHandler) BytesInFlight() protocol.ByteCount {
return 0
}
func (h *mockSentPacketHandler) GetLargestObserved() protocol.PacketNumber {
return 1
}
func newMockSentPacketHandler() ackhandler.SentPacketHandler {
return &mockSentPacketHandler{}
}
var _ = Describe("Packet packer", func() {
var (
packer *packetPacker
@@ -18,7 +46,11 @@ var _ = Describe("Packet packer", func() {
BeforeEach(func() {
aead := &crypto.NullAEAD{}
packer = &packetPacker{aead: aead, connectionParametersManager: handshake.NewConnectionParamatersManager()}
packer = &packetPacker{
aead: aead,
connectionParametersManager: handshake.NewConnectionParamatersManager(),
sentPacketHandler: newMockSentPacketHandler(),
}
})
It("returns nil when no packet is queued", func() {
@@ -34,10 +66,10 @@ var _ = Describe("Packet packer", func() {
}
packer.AddStreamFrame(f)
p, err := packer.PackPacket(nil, []frames.Frame{}, true)
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
Expect(p).ToNot(BeNil())
b := &bytes.Buffer{}
f.Write(b, 1, 6, 0)
f.Write(b, 1, protocol.PacketNumberLen6, 0)
Expect(len(p.frames)).To(Equal(1))
Expect(p.raw).To(ContainSubstring(string(b.Bytes())))
})
@@ -80,7 +112,7 @@ var _ = Describe("Packet packer", func() {
It("packs many control frames into 1 packets", func() {
f := &frames.AckFrame{LargestObserved: 1}
b := &bytes.Buffer{}
f.Write(b, 3, 6, 32)
f.Write(b, 3, protocol.PacketNumberLen6, 32)
maxFramesPerPacket := protocol.MaxFrameSize / b.Len()
var controlFrames []frames.Frame
for i := 0; i < maxFramesPerPacket; i++ {
@@ -146,8 +178,8 @@ var _ = Describe("Packet packer", func() {
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
b := &bytes.Buffer{}
f1.Write(b, 2, 6, 0)
f2.Write(b, 2, 6, 0)
f1.Write(b, 2, protocol.PacketNumberLen6, 0)
f2.Write(b, 2, protocol.PacketNumberLen6, 0)
Expect(len(p.frames)).To(Equal(2))
Expect(p.raw).To(ContainSubstring(string(b.Bytes())))
})
@@ -172,7 +204,8 @@ var _ = Describe("Packet packer", func() {
Expect(len(payloadFrames)).To(Equal(0))
})
It("packs 2 stream frames that are too big for one packet correctly", func() {
// set pending until https://github.com/lucas-clemente/quic-go/issues/67 is fixed
PIt("packs 2 stream frames that are too big for one packet correctly", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)
f1 := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, maxStreamFrameDataLen+100),
@@ -198,7 +231,8 @@ var _ = Describe("Packet packer", func() {
Expect(p).To(BeNil())
})
It("packs a packet that has the maximum packet size when given a large enough stream frame", func() {
// set pending until https://github.com/lucas-clemente/quic-go/issues/67 is fixed
PIt("packs a packet that has the maximum packet size when given a large enough stream frame", func() {
f := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, protocol.MaxFrameSize-(1+4+8+2)),
Offset: 1,