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

server node gets correct ip on update to network range

Browse source
This commit is contained in:
Matthew R. Kasun 2022-02-16 13:27:13 -05:00
parent 5b6553153b
commit 394271289a
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
logic/networks.go
View file

@ -202,7 +202,7 @@ func UniqueAddress(networkName string) (string, error) {
} }
//TODO //TODO
err1 := errors.New("ERROR: No unique addresses available. Check network subnet.") err1 := errors.New("ERROR: No unique addresses available. Check network subnet")
return "W1R3: NO UNIQUE ADDRESSES AVAILABLE", err1 return "W1R3: NO UNIQUE ADDRESSES AVAILABLE", err1
} }
@ -301,7 +301,7 @@ func UniqueAddress6(networkName string) (string, error) {
} }
} }
//TODO //TODO
err1 := errors.New("ERROR: No unique addresses available. Check network subnet.") err1 := errors.New("ERROR: No unique addresses available. Check network subnet")
return "W1R3: NO UNIQUE ADDRESSES AVAILABLE", err1 return "W1R3: NO UNIQUE ADDRESSES AVAILABLE", err1
} }
@ -380,7 +380,13 @@ func UpdateNetworkLocalAddresses(networkName string) error {
return err return err
} }
if node.Network == networkName { if node.Network == networkName {
ipaddr, iperr := UniqueAddress(networkName) var ipaddr string
var iperr error
if node.IsServer == "yes" {
ipaddr, iperr = UniqueAddressServer(networkName)
} else {
ipaddr, iperr = UniqueAddress(networkName)
}
if iperr != nil { if iperr != nil {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return iperr return iperr
@ -469,7 +475,13 @@ func UpdateNetworkNodeAddresses(networkName string) error {
return err return err
} }
if node.Network == networkName { if node.Network == networkName {
ipaddr, iperr := UniqueAddress(networkName) var ipaddr string
var iperr error
if node.IsServer == "yes" {
ipaddr, iperr = UniqueAddressServer(networkName)
} else {
ipaddr, iperr = UniqueAddress(networkName)
}
if iperr != nil { if iperr != nil {
fmt.Println("error in node address assignment!") fmt.Println("error in node address assignment!")
return iperr return iperr