From a36ea14cf586c5d585bae8181322954c81dca16e Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Wed, 12 Jan 2022 20:06:10 -0500 Subject: [PATCH] another adjustment --- logic/server.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/logic/server.go b/logic/server.go index 8afbacfd..2d315a3f 100644 --- a/logic/server.go +++ b/logic/server.go @@ -41,6 +41,7 @@ func ServerJoin(networkSettings *models.Network, serverID string) error { MacAddress: serverID, UDPHolePunch: "no", IsLocal: networkSettings.IsLocal, + LocalRange: networkSettings.LocalRange, } SetNodeDefaults(node) @@ -55,15 +56,15 @@ func ServerJoin(networkSettings *models.Network, serverID string) error { } if node.Endpoint == "" { - if node.IsLocal == "yes" { - var localAddr, localErr = getServerLocalIP(networkSettings) - if localErr != nil { - logger.Log(1, "could not acquire local address", localErr.Error()) - } else { - node.LocalAddress = localAddr - node.LocalRange = networkSettings.LocalRange - } - } + // if node.IsLocal == "yes" { + // var localAddr, localErr = getServerLocalIP(networkSettings) + // if localErr != nil { + // logger.Log(1, "could not acquire local address", localErr.Error()) + // } else { + // node.LocalAddress = localAddr + // node.LocalRange = networkSettings.LocalRange + // } + // } if node.IsLocal == "yes" && node.LocalAddress != "" { node.Endpoint = node.LocalAddress } else { @@ -446,6 +447,7 @@ func getServerLocalIP(networkSettings *models.Network) (string, error) { return "", err } for _, address := range currentAddresses { + logger.Log(3, "looking at local address:", address.String()) if currentCIDR.Contains(net.IP(address.Network())) { logger.Log(1, "setting local ip", address.String()) return address.String(), nil