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 Max{Stream, Connection}ReceiveWindow

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

46
config.go
View file

@ -75,17 +75,17 @@ func populateConfig(config *Config) *Config {
if initialStreamReceiveWindow == 0 { if initialStreamReceiveWindow == 0 {
initialStreamReceiveWindow = protocol.DefaultInitialMaxStreamData initialStreamReceiveWindow = protocol.DefaultInitialMaxStreamData
} }
maxReceiveStreamFlowControlWindow := config.MaxReceiveStreamFlowControlWindow maxStreamReceiveWindow := config.MaxStreamReceiveWindow
if maxReceiveStreamFlowControlWindow == 0 { if maxStreamReceiveWindow == 0 {
maxReceiveStreamFlowControlWindow = protocol.DefaultMaxReceiveStreamFlowControlWindow maxStreamReceiveWindow = protocol.DefaultMaxReceiveStreamFlowControlWindow
} }
initialConnectionReceiveWindow := config.InitialConnectionReceiveWindow initialConnectionReceiveWindow := config.InitialConnectionReceiveWindow
if initialConnectionReceiveWindow == 0 { if initialConnectionReceiveWindow == 0 {
initialConnectionReceiveWindow = protocol.DefaultInitialMaxData initialConnectionReceiveWindow = protocol.DefaultInitialMaxData
} }
maxReceiveConnectionFlowControlWindow := config.MaxReceiveConnectionFlowControlWindow maxConnectionReceiveWindow := config.MaxConnectionReceiveWindow
if maxReceiveConnectionFlowControlWindow == 0 { if maxConnectionReceiveWindow == 0 {
maxReceiveConnectionFlowControlWindow = protocol.DefaultMaxReceiveConnectionFlowControlWindow maxConnectionReceiveWindow = protocol.DefaultMaxReceiveConnectionFlowControlWindow
} }
maxIncomingStreams := config.MaxIncomingStreams maxIncomingStreams := config.MaxIncomingStreams
if maxIncomingStreams == 0 { if maxIncomingStreams == 0 {
@ -101,22 +101,22 @@ func populateConfig(config *Config) *Config {
} }
return &Config{ return &Config{
Versions: versions, Versions: versions,
HandshakeIdleTimeout: handshakeIdleTimeout, HandshakeIdleTimeout: handshakeIdleTimeout,
MaxIdleTimeout: idleTimeout, MaxIdleTimeout: idleTimeout,
AcceptToken: config.AcceptToken, AcceptToken: config.AcceptToken,
KeepAlive: config.KeepAlive, KeepAlive: config.KeepAlive,
InitialStreamReceiveWindow: initialStreamReceiveWindow, InitialStreamReceiveWindow: initialStreamReceiveWindow,
MaxReceiveStreamFlowControlWindow: maxReceiveStreamFlowControlWindow, MaxStreamReceiveWindow: maxStreamReceiveWindow,
InitialConnectionReceiveWindow: initialConnectionReceiveWindow, InitialConnectionReceiveWindow: initialConnectionReceiveWindow,
MaxReceiveConnectionFlowControlWindow: maxReceiveConnectionFlowControlWindow, MaxConnectionReceiveWindow: maxConnectionReceiveWindow,
MaxIncomingStreams: maxIncomingStreams, MaxIncomingStreams: maxIncomingStreams,
MaxIncomingUniStreams: maxIncomingUniStreams, MaxIncomingUniStreams: maxIncomingUniStreams,
ConnectionIDLength: config.ConnectionIDLength, ConnectionIDLength: config.ConnectionIDLength,
StatelessResetKey: config.StatelessResetKey, StatelessResetKey: config.StatelessResetKey,
TokenStore: config.TokenStore, TokenStore: config.TokenStore,
EnableDatagrams: config.EnableDatagrams, EnableDatagrams: config.EnableDatagrams,
DisablePathMTUDiscovery: config.DisablePathMTUDiscovery, DisablePathMTUDiscovery: config.DisablePathMTUDiscovery,
Tracer: config.Tracer, Tracer: config.Tracer,
} }
} }

8
config_test.go
View file

@ -59,11 +59,11 @@ var _ = Describe("Config", func() {
f.Set(reflect.ValueOf(NewLRUTokenStore(2, 3))) f.Set(reflect.ValueOf(NewLRUTokenStore(2, 3)))
case "InitialStreamReceiveWindow": case "InitialStreamReceiveWindow":
f.Set(reflect.ValueOf(uint64(1234))) f.Set(reflect.ValueOf(uint64(1234)))
case "MaxReceiveStreamFlowControlWindow": case "MaxStreamReceiveWindow":
f.Set(reflect.ValueOf(uint64(9))) f.Set(reflect.ValueOf(uint64(9)))
case "InitialConnectionReceiveWindow": case "InitialConnectionReceiveWindow":
f.Set(reflect.ValueOf(uint64(4321))) f.Set(reflect.ValueOf(uint64(4321)))
case "MaxReceiveConnectionFlowControlWindow": case "MaxConnectionReceiveWindow":
f.Set(reflect.ValueOf(uint64(10))) f.Set(reflect.ValueOf(uint64(10)))
case "MaxIncomingStreams": case "MaxIncomingStreams":
f.Set(reflect.ValueOf(int64(11))) f.Set(reflect.ValueOf(int64(11)))
@ -147,9 +147,9 @@ var _ = Describe("Config", func() {
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.InitialStreamReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxStreamData)) Expect(c.InitialStreamReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxStreamData))
Expect(c.MaxReceiveStreamFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveStreamFlowControlWindow)) Expect(c.MaxStreamReceiveWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveStreamFlowControlWindow))
Expect(c.InitialConnectionReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxData)) Expect(c.InitialConnectionReceiveWindow).To(BeEquivalentTo(protocol.DefaultInitialMaxData))
Expect(c.MaxReceiveConnectionFlowControlWindow).To(BeEquivalentTo(protocol.DefaultMaxReceiveConnectionFlowControlWindow)) Expect(c.MaxConnectionReceiveWindow).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))
Expect(c.DisablePathMTUDiscovery).To(BeFalse()) Expect(c.DisablePathMTUDiscovery).To(BeFalse())

12
interface.go
View file

@ -257,20 +257,20 @@ type Config struct {
TokenStore TokenStore TokenStore TokenStore
// InitialStreamReceiveWindow 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 MaxStreamReceiveWindow.
// If this value is zero, it will default to 512 KB. // If this value is zero, it will default to 512 KB.
InitialStreamReceiveWindow uint64 InitialStreamReceiveWindow uint64
// MaxReceiveStreamFlowControlWindow is the maximum stream-level flow control window for receiving data. // MaxStreamReceiveWindow 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 MaxStreamReceiveWindow uint64
// InitialConnectionReceiveWindow 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 MaxConnectionReceiveWindow.
// If this value is zero, it will default to 512 KB. // If this value is zero, it will default to 512 KB.
InitialConnectionReceiveWindow uint64 InitialConnectionReceiveWindow uint64
// MaxReceiveConnectionFlowControlWindow is the connection-level flow control window for receiving data. // MaxConnectionReceiveWindow 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 MaxConnectionReceiveWindow uint64
// MaxIncomingStreams is the maximum number of concurrent bidirectional streams that a peer is allowed to open. // MaxIncomingStreams is the maximum number of concurrent bidirectional streams that a peer is allowed to open.
// Values above 2^60 are invalid. // Values above 2^60 are invalid.
// If not set, it will default to 100. // If not set, it will default to 100.

4
session.go
View file

@ -504,7 +504,7 @@ func (s *session) preSetup() {
s.rttStats = &utils.RTTStats{} s.rttStats = &utils.RTTStats{}
s.connFlowController = flowcontrol.NewConnectionFlowController( s.connFlowController = flowcontrol.NewConnectionFlowController(
protocol.ByteCount(s.config.InitialConnectionReceiveWindow), protocol.ByteCount(s.config.InitialConnectionReceiveWindow),
protocol.ByteCount(s.config.MaxReceiveConnectionFlowControlWindow), protocol.ByteCount(s.config.MaxConnectionReceiveWindow),
s.onHasConnectionWindowUpdate, s.onHasConnectionWindowUpdate,
s.rttStats, s.rttStats,
s.logger, s.logger,
@ -1835,7 +1835,7 @@ func (s *session) newFlowController(id protocol.StreamID) flowcontrol.StreamFlow
id, id,
s.connFlowController, s.connFlowController,
protocol.ByteCount(s.config.InitialStreamReceiveWindow), protocol.ByteCount(s.config.InitialStreamReceiveWindow),
protocol.ByteCount(s.config.MaxReceiveStreamFlowControlWindow), protocol.ByteCount(s.config.MaxStreamReceiveWindow),
initialSendWindow, initialSendWindow,
s.onHasStreamWindowUpdate, s.onHasStreamWindowUpdate,
s.rttStats, s.rttStats,