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

use booleans

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-06-07 15:17:04 -04:00
parent 86bfed4c61
commit d418f2d65f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
logic/relay.go
View File

@@ -37,7 +37,7 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil { if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil {
return returnnodes, models.Node{}, err return returnnodes, models.Node{}, err
} }
returnnodes, err = SetRelayedNodes("yes", node.Network, node.RelayAddrs) returnnodes, err = SetRelayedNodes(true, node.Network, node.RelayAddrs)
if err != nil { if err != nil {
return returnnodes, node, err return returnnodes, node, err
} }
@@ -48,7 +48,7 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
} }
// SetRelayedNodes- set relayed nodes // SetRelayedNodes- set relayed nodes
func SetRelayedNodes(yesOrno string, networkName string, addrs []string) ([]models.Node, error) { func SetRelayedNodes(setRelayed bool, networkName string, addrs []string) ([]models.Node, error) {
var returnnodes []models.Node var returnnodes []models.Node
collections, err := database.FetchRecords(database.NODES_TABLE_NAME) collections, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil { if err != nil {
@@ -69,9 +69,9 @@ func SetRelayedNodes(yesOrno string, networkName string, addrs []string) ([]mode
if node.Network == networkName && !(node.IsServer == "yes") { if node.Network == networkName && !(node.IsServer == "yes") {
for _, addr := range addrs { for _, addr := range addrs {
if addr == node.Address || addr == node.Address6 { if addr == node.Address || addr == node.Address6 {
node.IsRelayed = yesOrno if setRelayed {
if yesOrno == "yes" {
node.UDPHolePunch = "no" node.UDPHolePunch = "no"
node.IsRelayed = "yes"
} else { } else {
node.UDPHolePunch = network.DefaultUDPHolePunch node.UDPHolePunch = network.DefaultUDPHolePunch
} }
@@ -135,11 +135,11 @@ func ValidateRelay(relay models.RelayRequest) error {
func UpdateRelay(network string, oldAddrs []string, newAddrs []string) []models.Node { func UpdateRelay(network string, oldAddrs []string, newAddrs []string) []models.Node {
var returnnodes []models.Node var returnnodes []models.Node
time.Sleep(time.Second / 4) time.Sleep(time.Second / 4)
returnnodes, err := SetRelayedNodes("no", network, oldAddrs) _, err := SetRelayedNodes(false, network, oldAddrs)
if err != nil { if err != nil {
logger.Log(1, err.Error()) logger.Log(1, err.Error())
} }
returnnodes, err = SetRelayedNodes("yes", network, newAddrs) returnnodes, err = SetRelayedNodes(true, network, newAddrs)
if err != nil { if err != nil {
logger.Log(1, err.Error()) logger.Log(1, err.Error())
} }
@@ -153,7 +153,7 @@ func DeleteRelay(network, nodeid string) ([]models.Node, models.Node, error) {
if err != nil { if err != nil {
return returnnodes, models.Node{}, err return returnnodes, models.Node{}, err
} }
_, err = SetRelayedNodes("no", node.Network, node.RelayAddrs) _, err = SetRelayedNodes(false, node.Network, node.RelayAddrs)
if err != nil { if err != nil {
return returnnodes, node, err return returnnodes, node, err
} }