zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-15 13:21:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor logic revisions

Browse Source
This commit is contained in:
afeiszli
2022-04-24 13:47:23 -04:00
parent 91ca96534b
commit 9a66674a5c
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/peers.go
View File

@@ -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 {
continue
}
if peer.LocalListenPort != 0 {
peer.ListenPort = peer.LocalListenPort
}
} else {
continue
}

5
logic/server.go
View File

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

2
netclient/functions/localport.go
View File

@@ -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 {