TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: migrate all platforms to controlplane.tailscale.com

Browse Source 
Updates #3488

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-03-09 20:16:39 -08:00 committed by Maisem Ali
parent 1625e87526
commit 888e50e1f6
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipn/ipnlocal/local.go
View File

@ -1543,23 +1543,16 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs) (err
return fmt.Errorf("PrefsFromBytes: %v", err) return fmt.Errorf("PrefsFromBytes: %v", err)
} }
// On mobile platforms, ignore any old stored preferences for // Ignore any old stored preferences for https://login.tailscale.com
// https://login.tailscale.com as the control server that // as the control server that would override the new default of
// would override the new default of controlplane.tailscale.com. // controlplane.tailscale.com.
// This makes sure that mobile clients go through the new // This makes sure that mobile clients go through the new
// frontends where we're (2021-10-02) doing battery // frontends where we're (2021-10-02) doing battery
// optimization work ahead of turning down the old backends. // optimization work ahead of turning down the old backends.
// TODO(bradfitz): make this the default for all platforms if b.prefs != nil && b.prefs.ControlURL != "" &&
// later. But mobile is a relatively small chunk (compared to b.prefs.ControlURL != ipn.DefaultControlURL &&
// Linux, Windows, macOS) and moving mobile early for battery ipn.IsLoginServerSynonym(b.prefs.ControlURL) {
// gains is nice. b.prefs.ControlURL = ""
switch runtime.GOOS {
case "android", "ios":
if b.prefs != nil && b.prefs.ControlURL != "" &&
b.prefs.ControlURL != ipn.DefaultControlURL &&
ipn.IsLoginServerSynonym(b.prefs.ControlURL) {
b.prefs.ControlURL = ""
}
} }
b.logf("using backend prefs for %q: %s", key, b.prefs.Pretty()) b.logf("using backend prefs for %q: %s", key, b.prefs.Pretty())