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

correctly handle completed streams when popping frames

Browse source 
The streamsMap returns a nil stream (and a nil error) when the stream
has already completed.
This commit is contained in:
Marten Seemann 2018-01-22 09:51:28 +11:00
parent 15bcc2579f
commit 0b9d805e1a
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
stream_framer.go
View file

@ -113,8 +113,11 @@ func (f *streamFramer) maybePopNormalFrames(maxTotalLen protocol.ByteCount) []*w
} }
id := f.streamQueue[0] id := f.streamQueue[0]
f.streamQueue = f.streamQueue[1:] f.streamQueue = f.streamQueue[1:]
// This should never return an error. Better check it anyway.
// The stream will only be in the streamQueue, if it enqueued itself there.
str, err := f.streamGetter.GetOrOpenSendStream(id) str, err := f.streamGetter.GetOrOpenSendStream(id)
if err != nil { // can happen if the stream completed after it said it had data // The stream can be nil if it completed after it said it had data.
if str == nil || err != nil {
delete(f.activeStreams, id) delete(f.activeStreams, id)
continue continue
} }

3
stream_framer_test.go
View file

@ -2,7 +2,6 @@ package quic
import ( import (
"bytes" "bytes"
"errors"
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
@ -139,7 +138,7 @@ var _ = Describe("Stream Framer", func() {
}) })
It("skips a stream that was reported active, but was completed shortly after", func() { It("skips a stream that was reported active, but was completed shortly after", func() {
streamGetter.EXPECT().GetOrOpenSendStream(id1).Return(nil, errors.New("stream was already deleted")) streamGetter.EXPECT().GetOrOpenSendStream(id1).Return(nil, nil)
streamGetter.EXPECT().GetOrOpenSendStream(id2).Return(stream2, nil) streamGetter.EXPECT().GetOrOpenSendStream(id2).Return(stream2, nil)
f := &wire.StreamFrame{ f := &wire.StreamFrame{
StreamID: id2, StreamID: id2,