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

pass packet number and packet number length to frames.Write

Browse Source
This commit is contained in:
Marten Seemann
2016-04-25 11:34:18 +07:00
parent 7467e7ebff
commit f2eafb7179
13 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packet_packer.go
View File

@@ -42,7 +42,12 @@ func (p *packetPacker) PackPacket() (*packedPacket, error) {
return nil, nil
}
payload, err := p.composeNextPayload()
currentPacketNumber := protocol.PacketNumber(atomic.AddUint64(
(*uint64)(&p.lastPacketNumber),
1,
))
payload, err := p.composeNextPayload(currentPacketNumber)
if err != nil {
return nil, err
}
@@ -55,10 +60,6 @@ func (p *packetPacker) PackPacket() (*packedPacket, error) {
payload[0] = 1
}
currentPacketNumber := protocol.PacketNumber(atomic.AddUint64(
(*uint64)(&p.lastPacketNumber),
1,
))
var raw bytes.Buffer
responsePublicHeader := PublicHeader{
ConnectionID: p.connectionID,
@@ -83,7 +84,7 @@ func (p *packetPacker) PackPacket() (*packedPacket, error) {
}, nil
}
func (p *packetPacker) composeNextPayload() ([]byte, error) {
func (p *packetPacker) composeNextPayload(currentPacketNumber protocol.PacketNumber) ([]byte, error) {
var payload bytes.Buffer
payload.WriteByte(0) // The entropy bit is set in sendPayload
@@ -112,7 +113,7 @@ func (p *packetPacker) composeNextPayload() ([]byte, error) {
p.queuedFrames = p.queuedFrames[1:]
}
if err := frame.Write(&payload); err != nil {
if err := frame.Write(&payload, currentPacketNumber, 6); err != nil {
return nil, err
}
}