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

directly queue RST_STREAM frames on stream.Reset

Browse source
This commit is contained in:
Marten Seemann 2017-12-08 16:09:18 +07:00
parent 3679c56f7e
commit bd77f3081c
4 changed files with 57 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

38
stream.go
View file

@ -38,9 +38,11 @@ type stream struct {
ctxCancel context.CancelFunc
streamID protocol.StreamID
onData func()
// onReset is a callback that should send a RST_STREAM
onReset func(protocol.StreamID, protocol.ByteCount)
// onData tells the session that there's stuff to pack into a new packet
onData func()
// queueControlFrame queues a new control frame for sending
// it does not call onData
queueControlFrame func(wire.Frame)
readPosInFrame int
writeOffset protocol.ByteCount
@ -88,19 +90,19 @@ var errDeadline net.Error = &deadlineError{}
// newStream creates a new Stream
func newStream(StreamID protocol.StreamID,
onData func(),
onReset func(protocol.StreamID, protocol.ByteCount),
queueControlFrame func(wire.Frame),
flowController flowcontrol.StreamFlowController,
version protocol.VersionNumber,
) *stream {
s := &stream{
onData: onData,
onReset: onReset,
streamID: StreamID,
flowController: flowController,
frameQueue: newStreamFrameSorter(),
readChan: make(chan struct{}, 1),
writeChan: make(chan struct{}, 1),
version: version,
onData: onData,
queueControlFrame: queueControlFrame,
streamID: StreamID,
flowController: flowController,
frameQueue: newStreamFrameSorter(),
readChan: make(chan struct{}, 1),
writeChan: make(chan struct{}, 1),
version: version,
}
s.ctx, s.ctxCancel = context.WithCancel(context.Background())
return s
@ -421,7 +423,11 @@ func (s *stream) Reset(err error) {
s.signalWrite()
}
if s.shouldSendReset() {
s.onReset(s.streamID, s.writeOffset)
s.queueControlFrame(&wire.RstStreamFrame{
StreamID: s.streamID,
ByteOffset: s.writeOffset,
})
s.onData()
s.rstSent.Set(true)
}
s.mutex.Unlock()
@ -444,7 +450,11 @@ func (s *stream) RegisterRemoteError(err error, offset protocol.ByteCount) error
return err
}
if s.shouldSendReset() {
s.onReset(s.streamID, s.writeOffset)
s.queueControlFrame(&wire.RstStreamFrame{
StreamID: s.streamID,
ByteOffset: s.writeOffset,
})
s.onData()
s.rstSent.Set(true)
}
s.mutex.Unlock()