wgengine/router/router_linux.go: Switched cidrDiff("addr") and cidrDiff("route") order

Signed-off-by: Christina Wen <christina@tailscale.com>
router_linux.go: tailscale down restores /etc/resolv.conf file
2020-09-15 13:38:06 -04:00 · 2020-09-15 13:37:53 -04:00
1 changed files with 6 additions and 6 deletions
--- a/wgengine/router/router_linux.go
+++ b/wgengine/router/router_linux.go
@@ -172,18 +172,18 @@ func (r *linuxRouter) Set(cfg *Config) error {
 		return err
 	}

-	newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf)
-	if err != nil {
-		return err
-	}
-	r.addrs = newAddrs
-
 	newRoutes, err := cidrDiff("route", r.routes, cfg.Routes, r.addRoute, r.delRoute, r.logf)
 	if err != nil {
 		return err
 	}
 	r.routes = newRoutes

+	newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf)
+	if err != nil {
+		return err
+	}
+	r.addrs = newAddrs
+
 	switch {
 	case cfg.SNATSubnetRoutes == r.snatSubnetRoutes:
 		// state already correct, nothing to do.
Author	SHA1	Message	Date
Christina Wen	64f4ea7de3	wgengine/router/router_linux.go: Switched `cidrDiff("addr")` and `cidrDiff("route")` order Signed-off-by: Christina Wen <christina@tailscale.com>	2020-09-15 13:38:06 -04:00
Christina Wen	ee673d5967	router_linux.go: tailscale down restores /etc/resolv.conf file Signed-off-by: Christina Wen <christina@tailscale.com>	2020-09-15 13:37:53 -04:00