TUN-6503: Fix transport fallback from QUIC in face of dial error "no network activity"

This commit is contained in:
Nuno Diegues 2022-07-06 12:58:33 +01:00
parent ac7fdd5572
commit 7607ead143
3 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,10 @@
## 2022.7.1
### New Features
- It is now possible to connect cloudflared tunnel to Cloudflare Global Network with IPv6. See `cloudflared tunnel --help` and look for `edge-ip-version` for more information. For now, the default behavior is to still connect with IPv4 only.
### Bug Fixes
- Several bug fixes related with QUIC transport (used between cloudflared tunnel and Cloudflare Global Network). Updating to this version is highly recommended.
## 2022.4.0 ## 2022.4.0
### Bug Fixes ### Bug Fixes
- `cloudflared tunnel run` no longer logs the Tunnel token or JSON credentials in clear text as those are the secret - `cloudflared tunnel run` no longer logs the Tunnel token or JSON credentials in clear text as those are the secret

View File

@ -528,7 +528,7 @@ func tunnelFlags(shouldHide bool) []cli.Flag {
Usage: "Cloudflare Edge ip address version to connect with. {4, 6, auto}", Usage: "Cloudflare Edge ip address version to connect with. {4, 6, auto}",
EnvVars: []string{"TUNNEL_EDGE_IP_VERSION"}, EnvVars: []string{"TUNNEL_EDGE_IP_VERSION"},
Value: "4", Value: "4",
Hidden: true, Hidden: false,
}), }),
altsrc.NewStringFlag(&cli.StringFlag{ altsrc.NewStringFlag(&cli.StringFlag{
Name: tlsconfig.CaCertFlag, Name: tlsconfig.CaCertFlag,

View File

@ -412,8 +412,7 @@ func ServeTunnel(
} }
return err.Cause, !err.Permanent return err.Cause, !err.Permanent
case *connection.EdgeQuicDialError: case *connection.EdgeQuicDialError:
// Don't retry connection for a dial error return err, true
return err, false
case ReconnectSignal: case ReconnectSignal:
connLog.Logger().Info(). connLog.Logger().Info().
IPAddr(connection.LogFieldIPAddress, addr.UDP.IP). IPAddr(connection.LogFieldIPAddress, addr.UDP.IP).