wgengine/router/router_linux.go: Switched `cidrDiff("addr")` and `cidrDiff("route")` orderc22wen/route-addr

Signed-off-by: Christina Wen <christina@tailscale.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/wgengine/router/router_linux.go b/wgengine/router/router_linux.go
index fd101ef91..00529729d 100644
--- a/wgengine/router/router_linux.go
+++ b/wgengine/router/router_linux.go
@@ -163,33 +163,26 @@ func (r *linuxRouter) Close() error {
 }
 
 // Set implements the Router interface.
-func (r *linuxRouter) Set(cfg *Config) (err error) {
+func (r *linuxRouter) Set(cfg *Config) error {
 	if cfg == nil {
 		cfg = &shutdownConfig
 	}
 
-	defer func() {
-		if err != nil {
-			// restore /etc/resolv.conf to its original state.
-			r.dns.Set(dns.Config{})
-		}
-	}()
-
 	if err := r.setNetfilterMode(cfg.NetfilterMode); err != nil {
 		return err
 	}
 
-	newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf)
+	newRoutes, err := cidrDiff("route", r.routes, cfg.Routes, r.addRoute, r.delRoute, r.logf)
 	if err != nil {
 		return err
 	}
-	r.addrs = newAddrs
+	r.routes = newRoutes
 
-	newRoutes, err := cidrDiff("route", r.routes, cfg.Routes, r.addRoute, r.delRoute, r.logf)
+	newAddrs, err := cidrDiff("addr", r.addrs, cfg.LocalAddrs, r.addAddress, r.delAddress, r.logf)
 	if err != nil {
 		return err
 	}
-	r.routes = newRoutes
+	r.addrs = newAddrs
 
 	switch {
 	case cfg.SNATSubnetRoutes == r.snatSubnetRoutes: