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

server address enhancements

Browse Source
This commit is contained in:
afeiszli
2022-01-31 20:29:00 -05:00
parent 6e292dd0fa
commit 467ebfd7d7
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
logic/nodes.go
View File

@@ -142,6 +142,12 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
}
}
newNode.Fill(currentNode)
if currentNode.IsServer == "yes" && !validateServer(currentNode, newNode) {
return fmt.Errorf("this operation is not supported on server nodes")
}
// check for un-settable server values
if err := ValidateNode(newNode, true); err != nil {
return err
}
@@ -209,7 +215,11 @@ func CreateNode(node *models.Node) error {
}
}
SetNodeDefaults(node)
node.Address, err = UniqueAddress(node.Network)
if node.IsServer == "yes" {
node.Address, err = UniqueAddressServer(node.Network)
} else {
node.Address, err = UniqueAddress(node.Network)
}
if err != nil {
return err
}
@@ -609,3 +619,10 @@ func GetNetworkServerNodeID(network string) (string, error) {
}
return "", errors.New("could not find server node")
}
// validateServer - make sure servers dont change port or address
func validateServer(currentNode, newNode *models.Node) bool {
return (newNode.Address != currentNode.Address ||
newNode.ListenPort != currentNode.ListenPort ||
newNode.IsServer != "yes")
}