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

make CancelWrite a no-op when called after closing the stream

Browse source
This commit is contained in:
Marten Seemann 2019-01-24 09:22:46 +07:00
parent 415f79f892
commit 3808191679
3 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
interface.go
View file

@ -50,9 +50,9 @@ type Stream interface {
// It must not be called after calling CancelWrite. // It must not be called after calling CancelWrite.
io.Closer io.Closer
// CancelWrite aborts sending on this stream. // CancelWrite aborts sending on this stream.
// It must not be called after Close.
// Data already written, but not yet delivered to the peer is not guaranteed to be delivered reliably. // Data already written, but not yet delivered to the peer is not guaranteed to be delivered reliably.
// Write will unblock immediately, and future calls to Write will fail. // Write will unblock immediately, and future calls to Write will fail.
// When called multiple times or after closing the stream it is a no-op.
CancelWrite(ErrorCode) error CancelWrite(ErrorCode) error
// CancelRead aborts receiving on this stream. // CancelRead aborts receiving on this stream.
// It will ask the peer to stop transmitting stream data. // It will ask the peer to stop transmitting stream data.

5
send_stream.go
View file

@ -254,12 +254,9 @@ func (s *sendStream) CancelWrite(errorCode protocol.ApplicationErrorCode) error
// must be called after locking the mutex // must be called after locking the mutex
func (s *sendStream) cancelWriteImpl(errorCode protocol.ApplicationErrorCode, writeErr error) (bool /*completed */, error) { func (s *sendStream) cancelWriteImpl(errorCode protocol.ApplicationErrorCode, writeErr error) (bool /*completed */, error) {
if s.canceledWrite { if s.canceledWrite || s.finishedWriting {
return false, nil return false, nil
} }
if s.finishedWriting {
return false, fmt.Errorf("CancelWrite for closed stream %d", s.streamID)
}
s.canceledWrite = true s.canceledWrite = true
s.cancelWriteErr = writeErr s.cancelWriteErr = writeErr
s.signalWrite() s.signalWrite()

22
send_stream_test.go
View file

@ -589,27 +589,23 @@ var _ = Describe("Send Stream", func() {
It("doesn't allow further calls to Write", func() { It("doesn't allow further calls to Write", func() {
mockSender.EXPECT().queueControlFrame(gomock.Any()) mockSender.EXPECT().queueControlFrame(gomock.Any())
mockSender.EXPECT().onStreamCompleted(streamID) mockSender.EXPECT().onStreamCompleted(streamID)
err := str.CancelWrite(1234) Expect(str.CancelWrite(1234)).To(Succeed())
Expect(err).ToNot(HaveOccurred()) _, err := strWithTimeout.Write([]byte("foobar"))
_, err = strWithTimeout.Write([]byte("foobar"))
Expect(err).To(MatchError("Write on stream 1337 canceled with error code 1234")) Expect(err).To(MatchError("Write on stream 1337 canceled with error code 1234"))
}) })
It("only cancels once", func() { It("only cancels once", func() {
mockSender.EXPECT().queueControlFrame(gomock.Any()) mockSender.EXPECT().queueControlFrame(&wire.ResetStreamFrame{StreamID: streamID, ErrorCode: 1234})
mockSender.EXPECT().onStreamCompleted(streamID) mockSender.EXPECT().onStreamCompleted(streamID)
err := str.CancelWrite(1234) Expect(str.CancelWrite(1234)).To(Succeed())
Expect(err).ToNot(HaveOccurred()) Expect(str.CancelWrite(4321)).To(Succeed())
err = str.CancelWrite(4321)
Expect(err).ToNot(HaveOccurred())
}) })
It("doesn't cancel when the stream was already closed", func() { It("doesn't do anything when the stream was already closed", func() {
mockSender.EXPECT().onHasStreamData(streamID) mockSender.EXPECT().onHasStreamData(streamID)
err := str.Close() Expect(str.Close()).To(Succeed())
Expect(err).ToNot(HaveOccurred()) // don't EXPECT any calls to queueControlFrame
err = str.CancelWrite(123) Expect(str.CancelWrite(123)).To(Succeed())
Expect(err).To(MatchError("CancelWrite for closed stream 1337"))
}) })
}) })