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

make Stream.Close() a no-op after the stream was closed for shutdown

Browse source
This commit is contained in:
Marten Seemann 2020-03-25 16:48:32 +07:00
parent fd80fc683a
commit 599d937966
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
send_stream.go
View file

@ -311,9 +311,13 @@ func (s *sendStream) queueRetransmission(f wire.Frame) {
func (s *sendStream) Close() error { func (s *sendStream) Close() error {
s.mutex.Lock() s.mutex.Lock()
if s.closedForShutdown {
s.mutex.Unlock()
return nil
}
if s.canceledWrite { if s.canceledWrite {
s.mutex.Unlock() s.mutex.Unlock()
return fmt.Errorf("Close called for canceled stream %d", s.streamID) return fmt.Errorf("close called for canceled stream %d", s.streamID)
} }
s.ctxCancel() s.ctxCancel()
s.finishedWriting = true s.finishedWriting = true

5
send_stream_test.go
View file

@ -438,6 +438,11 @@ var _ = Describe("Send Stream", func() {
f, hasMoreData := str.popStreamFrame(1000) f, hasMoreData := str.popStreamFrame(1000)
Expect(f).To(BeNil()) Expect(f).To(BeNil())
Expect(hasMoreData).To(BeFalse()) Expect(hasMoreData).To(BeFalse())
Expect(str.Close()).To(Succeed())
f, hasMoreData = str.popStreamFrame(1000)
Expect(f).To(BeNil())
Expect(hasMoreData).To(BeFalse())
}) })
It("doesn't allow FIN twice", func() { It("doesn't allow FIN twice", func() {