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

Revert "TUN-6384: Correct duplicate connection error to fetch new IP first" 

This reverts commit 76add5ca77.
This commit is contained in:
Devin Carr 2022-06-14 16:07:47 -07:00
parent b9453b84bb
commit 0458ad41dd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
supervisor/tunnel.go
View File

@ -141,11 +141,10 @@ type DefaultAddrFallback struct {
func (f DefaultAddrFallback) ShouldGetNewAddress(err error) (needsNewAddress bool, isConnectivityError bool) { func (f DefaultAddrFallback) ShouldGetNewAddress(err error) (needsNewAddress bool, isConnectivityError bool) {
switch err.(type) { switch err.(type) {
case nil: // maintain current IP address case nil: // maintain current IP address
// DupConnRegisterTunnelError should indicate to get a new address immediately // Try the next address if it was a quic.IdleTimeoutError or
case connection.DupConnRegisterTunnelError: // dupConnRegisterTunnelError
return true, false
// Try the next address if it was a quic.IdleTimeoutError
case *quic.IdleTimeoutError, case *quic.IdleTimeoutError,
connection.DupConnRegisterTunnelError,
edgediscovery.DialError, edgediscovery.DialError,
*connection.EdgeQuicDialError: *connection.EdgeQuicDialError:
// Wait for two failures before falling back to a new address // Wait for two failures before falling back to a new address