UpdateRoutes: move newServerRoutesMap handling to first loop

see #612 (comment)

client/internal/routemanager/manager.go

@@ -150,22 +150,22 @@ func (m *DefaultManager) UpdateRoutes(updateSerial uint64, newRoutes []*route.Ro
 		newServerRoutesMap := make(map[string]*route.Route)
 		ownNetworkIDs := make(map[string]bool)
 
-		for _, newRoute := range newRoutes {
-			if newRoute.Peer == m.pubKey {
-				ownNetworkIDs[getHANetworkID(newRoute)] = true
-			}
-		}
-
 		for _, newRoute := range newRoutes {
 			networkID := getHANetworkID(newRoute)
-			if ownNetworkIDs[networkID] {
+			if newRoute.Peer == m.pubKey {
+				ownNetworkIDs[networkID] = true
 				// only linux is supported for now
 				if runtime.GOOS != "linux" {
 					log.Warnf("received a route to manage, but agent doesn't support router mode on %s OS", runtime.GOOS)
 					continue
 				}
 				newServerRoutesMap[newRoute.ID] = newRoute
-			} else {
+			}
+		}
+
+		for _, newRoute := range newRoutes {
+			networkID := getHANetworkID(newRoute)
+			if !ownNetworkIDs[networkID] {
 				// if prefix is too small, lets assume is a possible default route which is not yet supported
 				// we skip this route management
 				if newRoute.Network.Bits() < 7 {

client/internal/routemanager/manager_test.go

@@ -383,7 +383,7 @@ func TestManagerUpdateRoutes(t *testing.T) {
 			},
 			inputSerial:                   1,
 			shouldCheckServerRoutes:       runtime.GOOS == "linux",
-			serverRoutesExpected:          3,
+			serverRoutesExpected:          2,
 			clientNetworkWatchersExpected: 1,
 		},
 	}