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

simplify stream number calculation when sending STREAM_ID_BLOCKED frames

Browse source
This commit is contained in:
Marten Seemann 2019-05-30 15:56:57 +08:00
parent 82acc7f2b7
commit b0b8990dd0
3 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
streams_map_outgoing_bidi.go
View file

@ -82,17 +82,14 @@ func (m *outgoingBidiStreamsMap) OpenStreamSync() (streamI, error) {
func (m *outgoingBidiStreamsMap) openStreamImpl() (streamI, error) { func (m *outgoingBidiStreamsMap) openStreamImpl() (streamI, error) {
if m.nextStream > m.maxStream { if m.nextStream > m.maxStream {
if !m.blockedSent { if !m.blockedSent {
var streamNum uint64
if m.maxStream != protocol.InvalidStreamID { if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{ streamNum = m.maxStream.StreamNum()
Type: protocol.StreamTypeBidi,
StreamLimit: m.maxStream.StreamNum(),
})
} else {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeBidi,
StreamLimit: 0,
})
} }
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeBidi,
StreamLimit: streamNum,
})
m.blockedSent = true m.blockedSent = true
} }
return nil, errTooManyOpenStreams return nil, errTooManyOpenStreams

15
streams_map_outgoing_generic.go
View file

@ -80,17 +80,14 @@ func (m *outgoingItemsMap) OpenStreamSync() (item, error) {
func (m *outgoingItemsMap) openStreamImpl() (item, error) { func (m *outgoingItemsMap) openStreamImpl() (item, error) {
if m.nextStream > m.maxStream { if m.nextStream > m.maxStream {
if !m.blockedSent { if !m.blockedSent {
var streamNum uint64
if m.maxStream != protocol.InvalidStreamID { if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{ streamNum = m.maxStream.StreamNum()
Type: streamTypeGeneric,
StreamLimit: m.maxStream.StreamNum(),
})
} else {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: streamTypeGeneric,
StreamLimit: 0,
})
} }
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: streamTypeGeneric,
StreamLimit: streamNum,
})
m.blockedSent = true m.blockedSent = true
} }
return nil, errTooManyOpenStreams return nil, errTooManyOpenStreams

15
streams_map_outgoing_uni.go
View file

@ -82,17 +82,14 @@ func (m *outgoingUniStreamsMap) OpenStreamSync() (sendStreamI, error) {
func (m *outgoingUniStreamsMap) openStreamImpl() (sendStreamI, error) { func (m *outgoingUniStreamsMap) openStreamImpl() (sendStreamI, error) {
if m.nextStream > m.maxStream { if m.nextStream > m.maxStream {
if !m.blockedSent { if !m.blockedSent {
var streamNum uint64
if m.maxStream != protocol.InvalidStreamID { if m.maxStream != protocol.InvalidStreamID {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{ streamNum = m.maxStream.StreamNum()
Type: protocol.StreamTypeUni,
StreamLimit: m.maxStream.StreamNum(),
})
} else {
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeUni,
StreamLimit: 0,
})
} }
m.queueStreamIDBlocked(&wire.StreamsBlockedFrame{
Type: protocol.StreamTypeUni,
StreamLimit: streamNum,
})
m.blockedSent = true m.blockedSent = true
} }
return nil, errTooManyOpenStreams return nil, errTooManyOpenStreams