minor logic revisions

logic/peers.go

@@ -209,11 +209,9 @@ func GetPeerUpdate(node *models.Node) (models.PeerUpdate, error) {
 			// set_local
 			if node.LocalAddress != peer.LocalAddress && peer.LocalAddress != "" {
 				peer.Endpoint = peer.LocalAddress
-			} else {
+				if peer.LocalListenPort != 0 {
-				continue
+					peer.ListenPort = peer.LocalListenPort
-			}
+				}
-			if peer.LocalListenPort != 0 {
-				peer.ListenPort = peer.LocalListenPort
 			} else {
 				continue
 			}

logic/server.go

@@ -225,18 +225,13 @@ func GetServerPeers(serverNode *models.Node) ([]wgtypes.PeerConfig, bool, []stri
 		if serverNode.PublicKey == node.PublicKey {
 			continue
 		}
-		/*
+		if serverNode.Endpoint == node.Endpoint {
-			//		Test This: Removed logic to set local address for nodes on same network as server
+			if serverNode.LocalAddress != node.LocalAddress && node.LocalAddress != "" {
-			//		This may be causing issues setting nodes on server currently
+				node.Endpoint = node.LocalAddress
-			//		Removing may fix but could cause other issues
+			} else {
-					if serverNode.Endpoint == node.Endpoint {
+				continue
-						if serverNode.LocalAddress != node.LocalAddress && node.LocalAddress != "" {
+			}
-							node.Endpoint = node.LocalAddress
+		}
-						} else {
-							continue
-						}
-					}
-		*/
 		if currentNetworkACL != nil && currentNetworkACL.IsAllowed(acls.AclID(serverNode.ID), acls.AclID(node.ID)) {
 			continue
 		}

netclient/functions/localport.go

@@ -11,7 +11,7 @@ import (
 	"github.com/gravitl/netmaker/netclient/ncutils"
 )
 
-// Get LocalListenPort - Gets the port running on the local interface
+// GetLocalListenPort - Gets the port running on the local interface
 func GetLocalListenPort(ifacename string) (int32, error) {
 	portstring, err := ncutils.RunCmd("wg show "+ifacename+" listen-port", false)
 	if err != nil {