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

rename the Config values for Initial{Stream, Connection}ReceiveWindow

Browse source
This commit is contained in:
Marten Seemann 2021-03-13 11:21:11 +08:00
parent f51eff48e9
commit 354bbb0e2e
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config.go
View file

@ -71,17 +71,17 @@ func populateConfig(config *Config) *Config {
if config.MaxIdleTimeout != 0 { if config.MaxIdleTimeout != 0 {
idleTimeout = config.MaxIdleTimeout idleTimeout = config.MaxIdleTimeout
} }
initialStreamFlowControlWindow := config.InitialStreamFlowControlWindow initialStreamReceiveWindow := config.InitialStreamReceiveWindow
if initialStreamFlowControlWindow == 0 { if initialStreamReceiveWindow == 0 {
initialStreamFlowControlWindow = protocol.DefaultInitialMaxStreamData initialStreamReceiveWindow = protocol.DefaultInitialMaxStreamData
} }
maxReceiveStreamFlowControlWindow := config.MaxReceiveStreamFlowControlWindow maxReceiveStreamFlowControlWindow := config.MaxReceiveStreamFlowControlWindow
if maxReceiveStreamFlowControlWindow == 0 { if maxReceiveStreamFlowControlWindow == 0 {
maxReceiveStreamFlowControlWindow = protocol.DefaultMaxReceiveStreamFlowControlWindow maxReceiveStreamFlowControlWindow = protocol.DefaultMaxReceiveStreamFlowControlWindow
} }
initialConnectionFlowControlWindow := config.InitialConnectionFlowControlWindow initialConnectionReceiveWindow := config.InitialConnectionReceiveWindow
if initialConnectionFlowControlWindow == 0 { if initialConnectionReceiveWindow == 0 {
initialConnectionFlowControlWindow = protocol.DefaultInitialMaxData initialConnectionReceiveWindow = protocol.DefaultInitialMaxData
} }
maxReceiveConnectionFlowControlWindow := config.MaxReceiveConnectionFlowControlWindow maxReceiveConnectionFlowControlWindow := config.MaxReceiveConnectionFlowControlWindow
if maxReceiveConnectionFlowControlWindow == 0 { if maxReceiveConnectionFlowControlWindow == 0 {
@ -106,9 +106,9 @@ func populateConfig(config *Config) *Config {
MaxIdleTimeout: idleTimeout, MaxIdleTimeout: idleTimeout,
AcceptToken: config.AcceptToken, AcceptToken: config.AcceptToken,
KeepAlive: config.KeepAlive, KeepAlive: config.KeepAlive,
InitialStreamFlowControlWindow: initialStreamFlowControlWindow, InitialStreamReceiveWindow: initialStreamReceiveWindow,
MaxReceiveStreamFlowControlWindow: maxReceiveStreamFlowControlWindow, MaxReceiveStreamFlowControlWindow: maxReceiveStreamFlowControlWindow,
InitialConnectionFlowControlWindow: initialConnectionFlowControlWindow, InitialConnectionReceiveWindow: initialConnectionReceiveWindow,
MaxReceiveConnectionFlowControlWindow: maxReceiveConnectionFlowControlWindow, MaxReceiveConnectionFlowControlWindow: maxReceiveConnectionFlowControlWindow,
MaxIncomingStreams: maxIncomingStreams, MaxIncomingStreams: maxIncomingStreams,
MaxIncomingUniStreams: maxIncomingUniStreams, MaxIncomingUniStreams: maxIncomingUniStreams,

8
config_test.go
View file

@ -57,11 +57,11 @@ var _ = Describe("Config", func() {
f.Set(reflect.ValueOf(time.Hour)) f.Set(reflect.ValueOf(time.Hour))
case "TokenStore": case "TokenStore":
f.Set(reflect.ValueOf(NewLRUTokenStore(2, 3))) f.Set(reflect.ValueOf(NewLRUTokenStore(2, 3)))
case "InitialStreamFlowControlWindow": case "InitialStreamReceiveWindow":
f.Set(reflect.ValueOf(uint64(1234))) f.Set(reflect.ValueOf(uint64(1234)))
case "MaxReceiveStreamFlowControlWindow": case "MaxReceiveStreamFlowControlWindow":
f.Set(reflect.ValueOf(uint64(9))) f.Set(reflect.ValueOf(uint64(9)))
case "InitialConnectionFlowControlWindow": case "InitialConnectionReceiveWindow":
f.Set(reflect.ValueOf(uint64(4321))) f.Set(reflect.ValueOf(uint64(4321)))
case "MaxReceiveConnectionFlowControlWindow": case "MaxReceiveConnectionFlowControlWindow":
f.Set(reflect.ValueOf(uint64(10))) f.Set(reflect.ValueOf(uint64(10)))
@ -146,9 +146,9 @@ var _ = Describe("Config", func() {
c := populateConfig(&Config{}) c := populateConfig(&Config{})
Expect(c.Versions).To(Equal(protocol.SupportedVersions)) Expect(c.Versions).To(Equal(protocol.SupportedVersions))
Expect(c.HandshakeIdleTimeout).To(Equal(protocol.DefaultHandshakeIdleTimeout)) Expect(c.HandshakeIdleTimeout).To(Equal(protocol.DefaultHandshakeIdleTimeout))
Expect(c.InitialStreamFlowControlWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxStreamData)) Expect(c.InitialStreamReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxStreamData))
Expect(c.MaxReceiveStreamFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveStreamFlowControlWindow)) Expect(c.MaxReceiveStreamFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveStreamFlowControlWindow))
Expect(c.InitialConnectionFlowControlWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxData)) Expect(c.InitialConnectionReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxData))
Expect(c.MaxReceiveConnectionFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveConnectionFlowControlWindow)) Expect(c.MaxReceiveConnectionFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveConnectionFlowControlWindow))
Expect(c.MaxIncomingStreams).To(BeEquivalentTo(protocol.DefaultMaxIncomingStreams)) Expect(c.MaxIncomingStreams).To(BeEquivalentTo(protocol.DefaultMaxIncomingStreams))
Expect(c.MaxIncomingUniStreams).To(BeEquivalentTo(protocol.DefaultMaxIncomingUniStreams)) Expect(c.MaxIncomingUniStreams).To(BeEquivalentTo(protocol.DefaultMaxIncomingUniStreams))

8
interface.go
View file

@ -255,19 +255,19 @@ type Config struct {
// The key used to store tokens is the ServerName from the tls.Config, if set // The key used to store tokens is the ServerName from the tls.Config, if set
// otherwise the token is associated with the server's IP address. // otherwise the token is associated with the server's IP address.
TokenStore TokenStore TokenStore TokenStore
// InitialStreamFlowControlWindow is the initial size of the stream-level flow control window for receiving data. // InitialStreamReceiveWindow is the initial size of the stream-level flow control window for receiving data.
// If the application is consuming data quickly enough, the flow control auto-tuning algorithm // If the application is consuming data quickly enough, the flow control auto-tuning algorithm
// will increase the window up to MaxReceiveStreamFlowControlWindow. // will increase the window up to MaxReceiveStreamFlowControlWindow.
// If this value is zero, it will default to 512 KB. // If this value is zero, it will default to 512 KB.
InitialStreamFlowControlWindow uint64 InitialStreamReceiveWindow uint64
// MaxReceiveStreamFlowControlWindow is the maximum stream-level flow control window for receiving data. // MaxReceiveStreamFlowControlWindow is the maximum stream-level flow control window for receiving data.
// If this value is zero, it will default to 6 MB. // If this value is zero, it will default to 6 MB.
MaxReceiveStreamFlowControlWindow uint64 MaxReceiveStreamFlowControlWindow uint64
// InitialConnectionFlowControlWindow is the initial size of the stream-level flow control window for receiving data. // InitialConnectionReceiveWindow is the initial size of the stream-level flow control window for receiving data.
// If the application is consuming data quickly enough, the flow control auto-tuning algorithm // If the application is consuming data quickly enough, the flow control auto-tuning algorithm
// will increase the window up to MaxReceiveConnectionFlowControlWindow. // will increase the window up to MaxReceiveConnectionFlowControlWindow.
// If this value is zero, it will default to 512 KB. // If this value is zero, it will default to 512 KB.
InitialConnectionFlowControlWindow uint64 InitialConnectionReceiveWindow uint64
// MaxReceiveConnectionFlowControlWindow is the connection-level flow control window for receiving data. // MaxReceiveConnectionFlowControlWindow is the connection-level flow control window for receiving data.
// If this value is zero, it will default to 15 MB. // If this value is zero, it will default to 15 MB.
MaxReceiveConnectionFlowControlWindow uint64 MaxReceiveConnectionFlowControlWindow uint64

20
session.go
View file

@ -302,10 +302,10 @@ var newSession = func(
initialStream := newCryptoStream() initialStream := newCryptoStream()
handshakeStream := newCryptoStream() handshakeStream := newCryptoStream()
params := &wire.TransportParameters{ params := &wire.TransportParameters{
InitialMaxStreamDataBidiLocal: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataBidiLocal: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxStreamDataBidiRemote: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataBidiRemote: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxStreamDataUni: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataUni: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxData: protocol.ByteCount(s.config.InitialConnectionFlowControlWindow), InitialMaxData: protocol.ByteCount(s.config.InitialConnectionReceiveWindow),
MaxIdleTimeout: s.config.MaxIdleTimeout, MaxIdleTimeout: s.config.MaxIdleTimeout,
MaxBidiStreamNum: protocol.StreamNum(s.config.MaxIncomingStreams), MaxBidiStreamNum: protocol.StreamNum(s.config.MaxIncomingStreams),
MaxUniStreamNum: protocol.StreamNum(s.config.MaxIncomingUniStreams), MaxUniStreamNum: protocol.StreamNum(s.config.MaxIncomingUniStreams),
@ -426,10 +426,10 @@ var newClientSession = func(
initialStream := newCryptoStream() initialStream := newCryptoStream()
handshakeStream := newCryptoStream() handshakeStream := newCryptoStream()
params := &wire.TransportParameters{ params := &wire.TransportParameters{
InitialMaxStreamDataBidiRemote: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataBidiRemote: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxStreamDataBidiLocal: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataBidiLocal: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxStreamDataUni: protocol.ByteCount(s.config.InitialStreamFlowControlWindow), InitialMaxStreamDataUni: protocol.ByteCount(s.config.InitialStreamReceiveWindow),
InitialMaxData: protocol.ByteCount(s.config.InitialConnectionFlowControlWindow), InitialMaxData: protocol.ByteCount(s.config.InitialConnectionReceiveWindow),
MaxIdleTimeout: s.config.MaxIdleTimeout, MaxIdleTimeout: s.config.MaxIdleTimeout,
MaxBidiStreamNum: protocol.StreamNum(s.config.MaxIncomingStreams), MaxBidiStreamNum: protocol.StreamNum(s.config.MaxIncomingStreams),
MaxUniStreamNum: protocol.StreamNum(s.config.MaxIncomingUniStreams), MaxUniStreamNum: protocol.StreamNum(s.config.MaxIncomingUniStreams),
@ -503,7 +503,7 @@ func (s *session) preSetup() {
s.frameParser = wire.NewFrameParser(s.config.EnableDatagrams, s.version) s.frameParser = wire.NewFrameParser(s.config.EnableDatagrams, s.version)
s.rttStats = &utils.RTTStats{} s.rttStats = &utils.RTTStats{}
s.connFlowController = flowcontrol.NewConnectionFlowController( s.connFlowController = flowcontrol.NewConnectionFlowController(
protocol.ByteCount(s.config.InitialConnectionFlowControlWindow), protocol.ByteCount(s.config.InitialConnectionReceiveWindow),
protocol.ByteCount(s.config.MaxReceiveConnectionFlowControlWindow), protocol.ByteCount(s.config.MaxReceiveConnectionFlowControlWindow),
s.onHasConnectionWindowUpdate, s.onHasConnectionWindowUpdate,
s.rttStats, s.rttStats,
@ -1834,7 +1834,7 @@ func (s *session) newFlowController(id protocol.StreamID) flowcontrol.StreamFlow
return flowcontrol.NewStreamFlowController( return flowcontrol.NewStreamFlowController(
id, id,
s.connFlowController, s.connFlowController,
protocol.ByteCount(s.config.InitialStreamFlowControlWindow), protocol.ByteCount(s.config.InitialStreamReceiveWindow),
protocol.ByteCount(s.config.MaxReceiveStreamFlowControlWindow), protocol.ByteCount(s.config.MaxReceiveStreamFlowControlWindow),
initialSendWindow, initialSendWindow,
s.onHasStreamWindowUpdate, s.onHasStreamWindowUpdate,