mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

handle control frames and Stream frames separately in PacketPacker

Browse source
This commit is contained in:
Marten Seemann 2016-04-26 23:30:43 +07:00
parent a962c63642
commit 8339f210cb
6 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

79
packet_packer_test.go
View file

@ -27,8 +27,11 @@ var _ = Describe("Packet packer", func() {
})
It("packs single packets", func() {
f := &frames.AckFrame{}
packer.AddFrame(f)
f := frames.StreamFrame{
StreamID: 5,
Data: []byte{0xDE, 0xCA, 0xFB, 0xAD},
}
packer.AddStreamFrame(f)
p, err := packer.PackPacket([]frames.Frame{})
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
@ -38,11 +41,17 @@ var _ = Describe("Packet packer", func() {
Expect(p.raw).To(ContainSubstring(string(b.Bytes())))
})
It("packs multiple frames into single packet", func() {
f1 := &frames.AckFrame{LargestObserved: 1}
f2 := &frames.AckFrame{LargestObserved: 2}
packer.AddFrame(f1)
packer.AddFrame(f2)
It("packs multiple stream frames into single packet", func() {
f1 := frames.StreamFrame{
StreamID: 5,
Data: []byte{0xDE, 0xCA, 0xFB, 0xAD},
}
f2 := frames.StreamFrame{
StreamID: 5,
Data: []byte{0xBE, 0xEF, 0x13, 0x37},
}
packer.AddStreamFrame(f1)
packer.AddStreamFrame(f2)
p, err := packer.PackPacket([]frames.Frame{})
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
@ -52,33 +61,33 @@ var _ = Describe("Packet packer", func() {
Expect(len(p.frames)).To(Equal(2))
Expect(p.raw).To(ContainSubstring(string(b.Bytes())))
})
It("packs many normal frames into 2 packets", func() {
f := &frames.AckFrame{LargestObserved: 1}
b := &bytes.Buffer{}
f.Write(b, 3, 6)
maxFramesPerPacket := protocol.MaxFrameSize / b.Len()
counter := 0
for i := 0; i < maxFramesPerPacket+1; i++ {
packer.AddFrame(f)
counter++
}
payloadFrames, err := packer.composeNextPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(maxFramesPerPacket))
payloadFrames, err = packer.composeNextPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(counter - maxFramesPerPacket))
})
//
// It("packs many normal frames into 2 packets", func() {
// f := &frames.AckFrame{LargestObserved: 1}
// b := &bytes.Buffer{}
// f.Write(b, 3, 6)
// maxFramesPerPacket := protocol.MaxFrameSize / b.Len()
// counter := 0
// for i := 0; i < maxFramesPerPacket+1; i++ {
// packer.AddFrame(f)
// counter++
// }
// payloadFrames, err := packer.composeNextPacket([]frames.Frame{})
// Expect(err).ToNot(HaveOccurred())
// Expect(len(payloadFrames)).To(Equal(maxFramesPerPacket))
// payloadFrames, err = packer.composeNextPacket([]frames.Frame{})
// Expect(err).ToNot(HaveOccurred())
// Expect(len(payloadFrames)).To(Equal(counter - maxFramesPerPacket))
// })
Context("Stream Frame handling", func() {
It("does not splits a stream frame with maximum size", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)
f := &frames.StreamFrame{
f := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, maxStreamFrameDataLen),
Offset: 1,
}
packer.AddFrame(f)
packer.AddStreamFrame(f)
payloadFrames, err := packer.composeNextPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(1))
@ -89,16 +98,16 @@ var _ = Describe("Packet packer", func() {
It("packs 2 stream frames that are too big for one packet correctly", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)
f1 := &frames.StreamFrame{
f1 := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, maxStreamFrameDataLen+100),
Offset: 1,
}
f2 := &frames.StreamFrame{
f2 := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, maxStreamFrameDataLen+100),
Offset: 1,
}
packer.AddFrame(f1)
packer.AddFrame(f2)
packer.AddStreamFrame(f1)
packer.AddStreamFrame(f2)
p, err := packer.PackPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(len(p.raw)).To(Equal(protocol.MaxPacketSize))
@ -111,11 +120,11 @@ var _ = Describe("Packet packer", func() {
})
It("packs a packet that has the maximum packet size when given a large enough stream frame", func() {
f := &frames.StreamFrame{
f := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, protocol.MaxFrameSize-(1+4+8+2)),
Offset: 1,
}
packer.AddFrame(f)
packer.AddStreamFrame(f)
p, err := packer.PackPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(p).ToNot(BeNil())
@ -123,11 +132,11 @@ var _ = Describe("Packet packer", func() {
})
It("splits a stream frame larger than the maximum size", func() {
f := &frames.StreamFrame{
f := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, protocol.MaxFrameSize-(1+4+8+2)+1),
Offset: 1,
}
packer.AddFrame(f)
packer.AddStreamFrame(f)
payloadFrames, err := packer.composeNextPacket([]frames.Frame{})
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(1))