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

fixing address choosing

Browse Source
This commit is contained in:
afeiszli
2021-04-27 23:40:01 -04:00
parent 22b5a714fd
commit 5e114cba08
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
functions/helpers.go
View File

@@ -530,13 +530,17 @@ func UniqueAddress6(networkName string) (string, error) {
var network models.Network var network models.Network
network, err := GetParentNetwork(networkName) network, err := GetParentNetwork(networkName)
if err != nil { if !*network.IsDualStack {
return "", nil
}
if err != nil {
fmt.Println("UniqueAddress6 encountered an error") fmt.Println("UniqueAddress6 encountered an error")
return "666", err return "666", err
} }
offset := true offset := true
ip, ipnet, err := net.ParseCIDR(network.AddressRange) ip, ipnet, err := net.ParseCIDR(network.AddressRange6)
if err != nil { if err != nil {
fmt.Println("UniqueAddress6 encountered an error") fmt.Println("UniqueAddress6 encountered an error")
return "666", err return "666", err

1
models/returnNode.go
View File

@@ -3,6 +3,7 @@ package models
type ReturnNode struct { type ReturnNode struct {
Address string `json:"address" bson:"address"` Address string `json:"address" bson:"address"`
Address6 string `json:"address6" bson:"address6"`
Name string `json:"name" bson:"name"` Name string `json:"name" bson:"name"`
MacAddress string `json:"macaddress" bson:"macaddress"` MacAddress string `json:"macaddress" bson:"macaddress"`
LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin"` LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin"`