fix gw tag name migration

logic/peers.go

@@ -372,7 +372,6 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 			}
 
 			if uselocal {
-				peerConfig.Endpoint.IP = peer.LocalAddress.IP
 				peerConfig.Endpoint.Port = peerHost.ListenPort
 			}
 			var allowedToComm bool

migrate/migrate.go

@@ -468,14 +468,14 @@ func migrateToGws() {
 		upsert := false
 		for i, srcI := range acl.Src {
 			if srcI.ID == models.NodeTagID && srcI.Value == fmt.Sprintf("%s.%s", acl.NetworkID.String(), models.OldRemoteAccessTagName) {
-				srcI.Value = models.GwTagName
+				srcI.Value = fmt.Sprintf("%s.%s", acl.NetworkID.String(), models.GwTagName)
 				acl.Src[i] = srcI
 				upsert = true
 			}
 		}
 		for i, dstI := range acl.Dst {
 			if dstI.ID == models.NodeTagID && dstI.Value == fmt.Sprintf("%s.%s", acl.NetworkID.String(), models.OldRemoteAccessTagName) {
-				dstI.Value = models.GwTagName
+				dstI.Value = fmt.Sprintf("%s.%s", acl.NetworkID.String(), models.GwTagName)
 				acl.Dst[i] = dstI
 				upsert = true
 			}