gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 00:24:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

simplified

Browse source
This commit is contained in:
0xdcarns 2022-01-12 20:11:31 -05:00
parent a36ea14cf5
commit 02beb4b4dc
1 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
logic/server.go
View file

@ -53,18 +53,16 @@ func ServerJoin(networkSettings *models.Network, serverID string) error {
if node.LocalRange != "" && node.LocalAddress == "" { if node.LocalRange != "" && node.LocalAddress == "" {
logger.Log(1, "local vpn, getting local address from range:", node.LocalRange) logger.Log(1, "local vpn, getting local address from range:", node.LocalRange)
node.LocalAddress = GetLocalIP(*node) node.LocalAddress = GetLocalIP(*node)
var _, currentCIDR, cidrErr = net.ParseCIDR(node.LocalRange)
if cidrErr != nil {
return err
}
if !currentCIDR.Contains(net.IP(node.LocalAddress)) {
node.LocalAddress = ""
}
} }
if node.Endpoint == "" { 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" && node.LocalAddress != "" { if node.IsLocal == "yes" && node.LocalAddress != "" {
node.Endpoint = node.LocalAddress node.Endpoint = node.LocalAddress
} else { } else {
@ -434,24 +432,3 @@ func checkNodeActions(node *models.Node) string {
} }
return "" return ""
} }
// best effort, or get public ip
func getServerLocalIP(networkSettings *models.Network) (string, error) {
var networkCIDR = networkSettings.AddressRange
var currentAddresses, err = net.InterfaceAddrs()
if err != nil { // attempt to use public IP
return "", err
}
var _, currentCIDR, cidrErr = net.ParseCIDR(networkCIDR)
if cidrErr != nil {
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
}
}
return "", errors.New("could not find local ip")
}