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

fix error message for stream deletion errors

Browse source
This commit is contained in:
Marten Seemann 2019-11-08 11:00:43 +07:00
parent 914193cc9d
commit 394ff04fb1
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
streams_map.go
View file

@ -139,14 +139,14 @@ func (m *streamsMap) DeleteStream(id protocol.StreamID) error {
switch id.Type() { switch id.Type() {
case protocol.StreamTypeUni: case protocol.StreamTypeUni:
if id.InitiatedBy() == m.perspective { if id.InitiatedBy() == m.perspective {
return m.outgoingUniStreams.DeleteStream(num) return convertStreamError(m.outgoingUniStreams.DeleteStream(num), protocol.StreamTypeUni, m.perspective)
} }
return m.incomingUniStreams.DeleteStream(num) return convertStreamError(m.incomingUniStreams.DeleteStream(num), protocol.StreamTypeUni, m.perspective.Opposite())
case protocol.StreamTypeBidi: case protocol.StreamTypeBidi:
if id.InitiatedBy() == m.perspective { if id.InitiatedBy() == m.perspective {
return m.outgoingBidiStreams.DeleteStream(num) return convertStreamError(m.outgoingBidiStreams.DeleteStream(num), protocol.StreamTypeBidi, m.perspective)
} }
return m.incomingBidiStreams.DeleteStream(num) return convertStreamError(m.incomingBidiStreams.DeleteStream(num), protocol.StreamTypeBidi, m.perspective.Opposite())
} }
panic("") panic("")
} }

20
streams_map_test.go
View file

@ -209,6 +209,26 @@ var _ = Describe("Streams Map", func() {
Expect(str).ToNot(BeNil()) Expect(str).ToNot(BeNil())
Expect(str.StreamID()).To(Equal(id)) Expect(str.StreamID()).To(Equal(id))
}) })
It("errors when deleting unknown incoming unidirectional streams", func() {
id := ids.firstIncomingUniStream + 4
Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id)))
})
It("errors when deleting unknown outgoing unidirectional streams", func() {
id := ids.firstOutgoingUniStream + 4
Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id)))
})
It("errors when deleting unknown incoming bidirectional streams", func() {
id := ids.firstIncomingBidiStream + 4
Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id)))
})
It("errors when deleting unknown outgoing bidirectional streams", func() {
id := ids.firstOutgoingBidiStream + 4
Expect(m.DeleteStream(id)).To(MatchError(fmt.Sprintf("Tried to delete unknown stream %d", id)))
})
}) })
Context("getting streams", func() { Context("getting streams", func() {