From 5e114cba08866710e9f4b1664ef96792d91dc2c7 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Tue, 27 Apr 2021 23:40:01 -0400 Subject: [PATCH] fixing address choosing --- functions/helpers.go | 8 ++++++-- models/returnNode.go | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/functions/helpers.go b/functions/helpers.go index 92bf4edf..7a9f89a9 100644 --- a/functions/helpers.go +++ b/functions/helpers.go @@ -530,13 +530,17 @@ func UniqueAddress6(networkName string) (string, error) { var network models.Network network, err := GetParentNetwork(networkName) - if err != nil { + if !*network.IsDualStack { + return "", nil + } + + if err != nil { fmt.Println("UniqueAddress6 encountered an error") return "666", err } offset := true - ip, ipnet, err := net.ParseCIDR(network.AddressRange) + ip, ipnet, err := net.ParseCIDR(network.AddressRange6) if err != nil { fmt.Println("UniqueAddress6 encountered an error") return "666", err diff --git a/models/returnNode.go b/models/returnNode.go index df87c5ea..b18ba6bd 100644 --- a/models/returnNode.go +++ b/models/returnNode.go @@ -3,6 +3,7 @@ package models type ReturnNode struct { Address string `json:"address" bson:"address"` + Address6 string `json:"address6" bson:"address6"` Name string `json:"name" bson:"name"` MacAddress string `json:"macaddress" bson:"macaddress"` LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin"`