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

only increase packet number in PacketPacker when actually sending a packet

Browse Source
This commit is contained in:
Marten Seemann
2016-04-27 09:46:13 +07:00
parent 6db8ea285a
commit e4fc732d37
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packet_packer.go
View File

@@ -39,11 +39,6 @@ func (p *packetPacker) PackPacket(controlFrames []frames.Frame, includeStreamFra
p.mutex.Lock() p.mutex.Lock()
defer p.mutex.Unlock() // TODO: Split up? defer p.mutex.Unlock() // TODO: Split up?
currentPacketNumber := protocol.PacketNumber(atomic.AddUint64(
(*uint64)(&p.lastPacketNumber),
1,
))
payloadFrames, err := p.composeNextPacket(controlFrames, includeStreamFrames) payloadFrames, err := p.composeNextPacket(controlFrames, includeStreamFrames)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -53,6 +48,11 @@ func (p *packetPacker) PackPacket(controlFrames []frames.Frame, includeStreamFra
return nil, nil return nil, nil
} }
currentPacketNumber := protocol.PacketNumber(atomic.AddUint64(
(*uint64)(&p.lastPacketNumber),
1,
))
payload, err := p.getPayload(payloadFrames, currentPacketNumber) payload, err := p.getPayload(payloadFrames, currentPacketNumber)
if err != nil { if err != nil {
return nil, err return nil, err

21
packet_packer_test.go
View File

@@ -99,6 +99,27 @@ var _ = Describe("Packet packer", func() {
// Expect(len(payloadFrames)).To(Equal(counter - maxFramesPerPacket)) // Expect(len(payloadFrames)).To(Equal(counter - maxFramesPerPacket))
// }) // })
It("only increases the packet number when there is an actual packet to send", func() {
f := frames.StreamFrame{
StreamID: 5,
Data: []byte{0xDE, 0xCA, 0xFB, 0xAD},
}
packer.AddStreamFrame(f)
p, err := packer.PackPacket([]frames.Frame{}, true)
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
Expect(packer.lastPacketNumber).To(Equal(protocol.PacketNumber(1)))
p, err = packer.PackPacket([]frames.Frame{}, true)
Expect(p).To(BeNil())
Expect(err).ToNot(HaveOccurred())
Expect(packer.lastPacketNumber).To(Equal(protocol.PacketNumber(1)))
packer.AddStreamFrame(f)
p, err = packer.PackPacket([]frames.Frame{}, true)
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
Expect(packer.lastPacketNumber).To(Equal(protocol.PacketNumber(2)))
})
Context("Stream Frame handling", func() { Context("Stream Frame handling", func() {
It("does not splits a stream frame with maximum size", func() { It("does not splits a stream frame with maximum size", func() {
maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2) maxStreamFrameDataLen := protocol.MaxFrameSize - (1 + 4 + 8 + 2)