mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-06 01:07:41 +08:00
fix logic
This commit is contained in:
@@ -230,10 +230,10 @@ func CreateNode(node *models.Node) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
node.Address.Mask = net.CIDRMask(cidr.Mask.Size())
|
node.Address.Mask = net.CIDRMask(cidr.Mask.Size())
|
||||||
|
}
|
||||||
} else if !IsIPUnique(node.Network, node.Address.String(), database.NODES_TABLE_NAME, false) {
|
} else if !IsIPUnique(node.Network, node.Address.String(), database.NODES_TABLE_NAME, false) {
|
||||||
return fmt.Errorf("invalid address: ipv4 " + node.Address.String() + " is not unique")
|
return fmt.Errorf("invalid address: ipv4 " + node.Address.String() + " is not unique")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if node.Address6.IP == nil {
|
if node.Address6.IP == nil {
|
||||||
if parentNetwork.IsIPv6 == "yes" {
|
if parentNetwork.IsIPv6 == "yes" {
|
||||||
@@ -245,10 +245,10 @@ func CreateNode(node *models.Node) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
node.Address6.Mask = net.CIDRMask(cidr.Mask.Size())
|
node.Address6.Mask = net.CIDRMask(cidr.Mask.Size())
|
||||||
|
}
|
||||||
} else if !IsIPUnique(node.Network, node.Address6.String(), database.NODES_TABLE_NAME, true) {
|
} else if !IsIPUnique(node.Network, node.Address6.String(), database.NODES_TABLE_NAME, true) {
|
||||||
return fmt.Errorf("invalid address: ipv6 " + node.Address6.String() + " is not unique")
|
return fmt.Errorf("invalid address: ipv6 " + node.Address6.String() + " is not unique")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
node.ID = uuid.New()
|
node.ID = uuid.New()
|
||||||
//Create a JWT for the node
|
//Create a JWT for the node
|
||||||
|
Reference in New Issue
Block a user