From 888e50e1f6d71bd40a0b1f9267cda4cbcbfa53fd Mon Sep 17 00:00:00 2001
From: Maisem Ali <maisem@tailscale.com>
Date: Wed, 9 Mar 2022 20:16:39 -0800
Subject: [PATCH] ipn/ipnlocal: migrate all platforms to
 controlplane.tailscale.com

Updates #3488

Signed-off-by: Maisem Ali <maisem@tailscale.com>
---
 ipn/ipnlocal/local.go | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 890ae65d7..793da4973 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -1543,23 +1543,16 @@ func (b *LocalBackend) loadStateLocked(key ipn.StateKey, prefs *ipn.Prefs) (err
 		return fmt.Errorf("PrefsFromBytes: %v", err)
 	}
 
-	// On mobile platforms, ignore any old stored preferences for
-	// https://login.tailscale.com as the control server that
-	// would override the new default of controlplane.tailscale.com.
+	// Ignore any old stored preferences for https://login.tailscale.com
+	// as the control server that would override the new default of
+	// controlplane.tailscale.com.
 	// This makes sure that mobile clients go through the new
 	// frontends where we're (2021-10-02) doing battery
 	// optimization work ahead of turning down the old backends.
-	// TODO(bradfitz): make this the default for all platforms
-	// later. But mobile is a relatively small chunk (compared to
-	// Linux, Windows, macOS) and moving mobile early for battery
-	// gains is nice.
-	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 = ""
-		}
+	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())