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

fix race condition when queueing RST_STREAM frames

Browse source
This commit is contained in:
Marten Seemann 2017-12-13 17:35:34 +07:00
parent 3679c56f7e
commit c1559be957
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packet_packer.go
View file

@ -4,6 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"sync"
"github.com/lucas-clemente/quic-go/ackhandler"
"github.com/lucas-clemente/quic-go/internal/handshake"
@ -27,7 +28,9 @@ type packetPacker struct {
packetNumberGenerator *packetNumberGenerator
streamFramer *streamFramer
controlFrames []wire.Frame
controlFrameMutex sync.Mutex
controlFrames []wire.Frame
stopWaiting *wire.StopWaitingFrame
ackFrame *wire.AckFrame
leastUnacked protocol.PacketNumber
@ -219,6 +222,7 @@ func (p *packetPacker) composeNextPacket(
payloadLength += l
}
p.controlFrameMutex.Lock()
for len(p.controlFrames) > 0 {
frame := p.controlFrames[len(p.controlFrames)-1]
minLength := frame.MinLength(p.version)
@ -229,6 +233,7 @@ func (p *packetPacker) composeNextPacket(
payloadLength += minLength
p.controlFrames = p.controlFrames[:len(p.controlFrames)-1]
}
p.controlFrameMutex.Unlock()
if payloadLength > maxFrameSize {
return nil, fmt.Errorf("Packet Packer BUG: packet payload (%d) too large (%d)", payloadLength, maxFrameSize)
@ -260,7 +265,9 @@ func (p *packetPacker) composeNextPacket(
}
for b := p.streamFramer.PopBlockedFrame(); b != nil; b = p.streamFramer.PopBlockedFrame() {
p.controlFrameMutex.Lock()
p.controlFrames = append(p.controlFrames, b)
p.controlFrameMutex.Unlock()
}
return payloadFrames, nil
@ -273,7 +280,9 @@ func (p *packetPacker) QueueControlFrame(frame wire.Frame) {
case *wire.AckFrame:
p.ackFrame = f
default:
p.controlFrameMutex.Lock()
p.controlFrames = append(p.controlFrames, f)
p.controlFrameMutex.Unlock()
}
}