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

fix splitting of StreamFrames in PacketPacker

Browse Source
This commit is contained in:
Marten Seemann
2016-04-27 10:09:54 +07:00
parent e4fc732d37
commit 3f6b228d07
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packet_packer.go
View File

@@ -116,7 +116,7 @@ func (p *packetPacker) composeNextPacket(controlFrames []frames.Frame, includeSt
}
for len(p.queuedStreamFrames) > 0 {
frame := p.queuedStreamFrames[0]
frame := &p.queuedStreamFrames[0]
if payloadLength > protocol.MaxFrameSize {
panic("internal inconsistency: packet payload too large")
@@ -131,7 +131,7 @@ func (p *packetPacker) composeNextPacket(controlFrames []frames.Frame, includeSt
previousFrame := frame.MaybeSplitOffFrame(protocol.MaxFrameSize - payloadLength)
if previousFrame != nil {
// Don't pop the queue, leave the modified frame in
frame = *previousFrame
frame = previousFrame
payloadLength += len(previousFrame.Data) - 1
} else {
p.queuedStreamFrames = p.queuedStreamFrames[1:]
@@ -139,7 +139,7 @@ func (p *packetPacker) composeNextPacket(controlFrames []frames.Frame, includeSt
}
payloadLength += frame.MinLength()
payloadFrames = append(payloadFrames, &frame)
payloadFrames = append(payloadFrames, frame)
}
return payloadFrames, nil

23
packet_packer_test.go
View File

@@ -136,6 +136,26 @@ var _ = Describe("Packet packer", func() {
Expect(len(payloadFrames)).To(Equal(0))
})
It("splits one stream frame larger than maximum size", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)
f := frames.StreamFrame{
Data: bytes.Repeat([]byte{'f'}, maxStreamFrameDataLen+200),
Offset: 1,
}
packer.AddStreamFrame(f)
payloadFrames, err := packer.composeNextPacket([]frames.Frame{}, true)
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(1))
Expect(len(payloadFrames[0].(*frames.StreamFrame).Data)).To(Equal(maxStreamFrameDataLen))
payloadFrames, err = packer.composeNextPacket([]frames.Frame{}, true)
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(1))
Expect(len(payloadFrames[0].(*frames.StreamFrame).Data)).To(Equal(200))
payloadFrames, err = packer.composeNextPacket([]frames.Frame{}, true)
Expect(err).ToNot(HaveOccurred())
Expect(len(payloadFrames)).To(Equal(0))
})
It("packs 2 stream frames that are too big for one packet correctly", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)
f1 := frames.StreamFrame{
@@ -157,6 +177,9 @@ var _ = Describe("Packet packer", func() {
p, err = packer.PackPacket([]frames.Frame{}, true)
Expect(err).ToNot(HaveOccurred())
Expect(p).ToNot(BeNil())
p, err = packer.PackPacket([]frames.Frame{}, true)
Expect(err).ToNot(HaveOccurred())
Expect(p).To(BeNil())
})
It("packs a packet that has the maximum packet size when given a large enough stream frame", func() {