curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-6595: Enable datagramv2 and icmp proxy by default

This commit is contained in:
cthuang 2022-09-20 09:01:35 +01:00 committed by Chung-Ting Huang
parent b1995b4dd1
commit 3d345d3748
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloudflared/tunnel/configuration.go
View File

@ -44,7 +44,7 @@ var (
LogFieldHostname = "hostname" LogFieldHostname = "hostname"
secretFlags = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag} secretFlags = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag}
defaultFeatures = []string{supervisor.FeatureAllowRemoteConfig, supervisor.FeatureSerializedHeaders} defaultFeatures = []string{supervisor.FeatureAllowRemoteConfig, supervisor.FeatureSerializedHeaders, supervisor.FeatureDatagramV2}
configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq", "edge-ip-version"} configFlags = []string{"autoupdate-freq", "no-autoupdate", "retries", "protocol", "loglevel", "transport-loglevel", "origincert", "metrics", "metrics-update-freq", "edge-ip-version"}
) )

26
supervisor/supervisor.go
View File

@ -116,14 +116,12 @@ func NewSupervisor(config *TunnelConfig, orchestrator *orchestration.Orchestrato
gracefulShutdownC: gracefulShutdownC, gracefulShutdownC: gracefulShutdownC,
connAwareLogger: log, connAwareLogger: log,
} }
if useDatagramV2(config) {
// TODO: TUN-6701: Decouple upgrade of datagram v2 and using icmp proxy icmpRouter, err := ingress.NewICMPRouter(config.Log)
icmpRouter, err := ingress.NewICMPRouter(config.Log) if err != nil {
if err != nil { log.Logger().Warn().Err(err).Msg("Failed to create icmp router, ICMP proxy feature is disabled")
log.Logger().Warn().Err(err).Msg("Failed to create icmp router, will continue to use datagram v1") } else {
} else { edgeTunnelServer.icmpRouter = icmpRouter
edgeTunnelServer.icmpRouter = icmpRouter
}
} }
useReconnectToken := false useReconnectToken := false
@ -435,15 +433,3 @@ func (s *Supervisor) authenticate(ctx context.Context, numPreviousAttempts int)
registrationOptions.NumPreviousAttempts = uint8(numPreviousAttempts) registrationOptions.NumPreviousAttempts = uint8(numPreviousAttempts)
return rpcClient.Authenticate(ctx, s.config.ClassicTunnel, registrationOptions) return rpcClient.Authenticate(ctx, s.config.ClassicTunnel, registrationOptions)
} }
func useDatagramV2(config *TunnelConfig) bool {
if config.NamedTunnel == nil {
return false
}
for _, feature := range config.NamedTunnel.Client.Features {
if feature == FeatureDatagramV2 {
return true
}
}
return false
}