hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-28 12:30:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-6637: Upgrade quic-go

Browse Source
This commit is contained in:
Sudarsan Reddy
2022-08-10 14:19:03 +01:00
parent 4016334efc
commit 065d8355c5
12 changed files with 130 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vendor/github.com/lucas-clemente/quic-go/config.go generated vendored
View File

@@ -35,10 +35,7 @@ func validateConfig(config *Config) error {
// populateServerConfig populates fields in the quic.Config with their default values, if none are set
// it may be called with nil
func populateServerConfig(config *Config) *Config {
config = populateConfig(config)
if config.ConnectionIDLength == 0 {
config.ConnectionIDLength = protocol.DefaultConnectionIDLength
}
config = populateConfig(config, protocol.DefaultConnectionIDLength)
if config.AcceptToken == nil {
config.AcceptToken = defaultAcceptToken
}
@@ -48,14 +45,16 @@ func populateServerConfig(config *Config) *Config {
// populateClientConfig populates fields in the quic.Config with their default values, if none are set
// it may be called with nil
func populateClientConfig(config *Config, createdPacketConn bool) *Config {
config = populateConfig(config)
if config.ConnectionIDLength == 0 && !createdPacketConn {
config.ConnectionIDLength = protocol.DefaultConnectionIDLength
var defaultConnIdLen = protocol.DefaultConnectionIDLength
if createdPacketConn {
defaultConnIdLen = 0
}
config = populateConfig(config, defaultConnIdLen)
return config
}
func populateConfig(config *Config) *Config {
func populateConfig(config *Config, defaultConnIDLen int) *Config {
if config == nil {
config = &Config{}
}
@@ -63,6 +62,9 @@ func populateConfig(config *Config) *Config {
if len(versions) == 0 {
versions = protocol.SupportedVersions
}
if config.ConnectionIDLength == 0 {
config.ConnectionIDLength = defaultConnIDLen
}
handshakeIdleTimeout := protocol.DefaultHandshakeIdleTimeout
if config.HandshakeIdleTimeout != 0 {
handshakeIdleTimeout = config.HandshakeIdleTimeout
@@ -103,6 +105,10 @@ func populateConfig(config *Config) *Config {
if maxDatagrameFrameSize == 0 {
maxDatagrameFrameSize = int64(protocol.DefaultMaxDatagramFrameSize)
}
connIDGenerator := config.ConnectionIDGenerator
if connIDGenerator == nil {
connIDGenerator = &protocol.DefaultConnectionIDGenerator{ConnLen: config.ConnectionIDLength}
}
return &Config{
Versions: versions,
@@ -118,6 +124,7 @@ func populateConfig(config *Config) *Config {
MaxIncomingStreams: maxIncomingStreams,
MaxIncomingUniStreams: maxIncomingUniStreams,
ConnectionIDLength: config.ConnectionIDLength,
ConnectionIDGenerator: connIDGenerator,
StatelessResetKey: config.StatelessResetKey,
TokenStore: config.TokenStore,
EnableDatagrams: config.EnableDatagrams,