TUN-4940: Fix cloudflared not picking up correct NextProtos for quic

sudarshan-reddy · sudarshan-reddy · commit 071d59537102 · 2021-08-23T15:30:45.000Z
diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go
@@ -256,7 +256,7 @@ func prepareTunnelConfig(
 		if err != nil {
 			return nil, ingress.Ingress{}, errors.Wrap(err, "unable to create TLS config to connect with edge")
 		}
-		if len(edgeTLSConfig.NextProtos) > 0 {
+		if len(tlsSettings.NextProtos) > 0 {
 			edgeTLSConfig.NextProtos = tlsSettings.NextProtos
 		}
 		edgeTLSConfigs[p] = edgeTLSConfig

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func prepareTunnelConfig(`
`256`	`256`	`if err != nil {`
`257`	`257`	`return nil, ingress.Ingress{}, errors.Wrap(err, "unable to create TLS config to connect with edge")`
`258`	`258`	`}`
`259`		`- if len(edgeTLSConfig.NextProtos) > 0 {`
	`259`	`+ if len(tlsSettings.NextProtos) > 0 {`
`260`	`260`	`edgeTLSConfig.NextProtos = tlsSettings.NextProtos`
`261`	`261`	`}`
`262`	`262`	`edgeTLSConfigs[p] = edgeTLSConfig`