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

bugfix for reverse unique address

Browse Source
This commit is contained in:
0xdcarns
2022-04-21 09:58:18 -04:00
parent 99abd9666d
commit c39f2fed84
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
logic/networks.go
View File

@@ -188,13 +188,20 @@ func UniqueAddress(networkName string, reverse bool) (string, error) {
newAddr, err := ips.GetFirstAddr(network.AddressRange) newAddr, err := ips.GetFirstAddr(network.AddressRange)
if err != nil { if err != nil {
logger.Log(0, "UniqueAddressServer encountered an error") logger.Log(0, "UniqueAddress encountered an error")
return "666", err return "666", err
} }
incVal := 1 incVal := 1
if reverse { if reverse {
incVal = -1 incVal = -1
newAddr, err = ips.GetLastAddr(network.AddressRange)
if err != nil {
if err != nil {
logger.Log(0, "UniqueAddressServer encountered an error")
return "666", err
}
}
} }
for ; newAddr.ToAddressString().IsValid(); newAddr = newAddr.Increment(int64(incVal)) { for ; newAddr.ToAddressString().IsValid(); newAddr = newAddr.Increment(int64(incVal)) {
@@ -257,6 +264,13 @@ func UniqueAddress6(networkName string, reverse bool) (string, error) {
incVal := 1 incVal := 1
if reverse { if reverse {
incVal = -1 incVal = -1
newAddr6, err = ips.GetLastAddr6(network.AddressRange)
if err != nil {
if err != nil {
logger.Log(0, "UniqueAddress6Server encountered an error")
return "666", err
}
}
} }
for ; newAddr6.ToAddressString().IsValid(); newAddr6 = newAddr6.Increment(int64(incVal)) { for ; newAddr6.ToAddressString().IsValid(); newAddr6 = newAddr6.Increment(int64(incVal)) {