TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-29 04:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 327ea19746e7b0431a17562496dd0e708ab99abc into b3455fa99a5e8d07133d5140017ec7c49f032a07

Browse Source
This commit is contained in:
Josh De Winne 2025-03-24 22:14:04 +00:00 committed by GitHub
commit e869dc6fd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
control/controlhttp/client.go
View File

@ -263,6 +263,8 @@ func (a *Dialer) dial(ctx context.Context) (*ClientConn, error) {
// fixed, this is a workaround. It might also be useful for future debugging. // fixed, this is a workaround. It might also be useful for future debugging.
var forceNoise443 = envknob.RegisterBool("TS_FORCE_NOISE_443") var forceNoise443 = envknob.RegisterBool("TS_FORCE_NOISE_443")
var disableRecentNoiseDialHeuristic = envknob.RegisterBool("TS_DISABLE_RECENT_NOISE_DIAL_HEURISTIC")
// forceNoise443 reports whether the controlclient noise dialer should always // forceNoise443 reports whether the controlclient noise dialer should always
// use HTTPS connections as its underlay connection (double crypto). This can // use HTTPS connections as its underlay connection (double crypto). This can
// be necessary when networks or middle boxes are messing with port 80. // be necessary when networks or middle boxes are messing with port 80.
@ -271,7 +273,7 @@ func (d *Dialer) forceNoise443() bool {
return true return true
} }
if d.HealthTracker.LastNoiseDialWasRecent() { if !disableRecentNoiseDialHeuristic() && d.HealthTracker.LastNoiseDialWasRecent() {
// If we dialed recently, assume there was a recent failure and fall // If we dialed recently, assume there was a recent failure and fall
// back to HTTPS dials for the subsequent retries. // back to HTTPS dials for the subsequent retries.
// //