Ver Fonte

fixing address choosing

afeiszli há 4 anos atrás
pai
commit
5e114cba08
2 ficheiros alterados com 7 adições e 2 exclusões
  1. 6 2
      functions/helpers.go
  2. 1 0
      models/returnNode.go

+ 6 - 2
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

+ 1 - 0
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"`