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

Merge pull request #1201 from gravitl/bugfix_v0.14.3_relay

Browse source 
IsRelayed off on relayed node when deleting relay
This commit is contained in:
dcarns 2022-06-13 11:11:39 -04:00 • committed by GitHub
commit e657c2c717
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
logic/relay.go
View file

@ -50,7 +50,7 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
// SetRelayedNodes- set relayed nodes // SetRelayedNodes- set relayed nodes
func SetRelayedNodes(setRelayed bool, 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) networkNodes, err := GetNetworkNodes(networkName)
if err != nil { if err != nil {
return returnnodes, err return returnnodes, err
} }
@ -58,15 +58,8 @@ func SetRelayedNodes(setRelayed bool, networkName string, addrs []string) ([]mod
if err != nil { if err != nil {
return returnnodes, err return returnnodes, err
} }
for _, node := range networkNodes {
for _, value := range collections { if node.IsServer != "yes" {
var node models.Node
err := json.Unmarshal([]byte(value), &node)
if err != nil {
return returnnodes, err
}
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 {
if setRelayed { if setRelayed {
@ -74,6 +67,7 @@ func SetRelayedNodes(setRelayed bool, networkName string, addrs []string) ([]mod
node.IsRelayed = "yes" node.IsRelayed = "yes"
} else { } else {
node.UDPHolePunch = network.DefaultUDPHolePunch node.UDPHolePunch = network.DefaultUDPHolePunch
node.IsRelayed = "no"
} }
data, err := json.Marshal(&node) data, err := json.Marshal(&node)
if err != nil { if err != nil {