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

created comms filter

Browse source
This commit is contained in:
0xdcarns 2022-02-18 19:47:20 -05:00
parent c5a856d6c5
commit 0325795bf2
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
controllers/network.go
View file

@ -57,9 +57,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
for _, network := range networksSlice {
netObject, parentErr := logic.GetParentNetwork(network)
if parentErr == nil {
if netObject.IsComms != "yes" {
allnetworks = append(allnetworks, netObject)
}
allnetworks = append(allnetworks, netObject)
}
}
}
@ -71,7 +69,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
}
logger.Log(2, r.Header.Get("user"), "fetched networks.")
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(allnetworks)
json.NewEncoder(w).Encode(filterCommsNetwork(allnetworks))
}
// Simple get network function
@ -361,3 +359,13 @@ func isCommsEdit(w http.ResponseWriter, r *http.Request, netname string) bool {
}
return false
}
func filterCommsNetwork(networks []models.Network) []models.Network {
var filterdNets []models.Network
for i := range networks {
if networks[i].IsComms != "yes" && networks[i].NetID != servercfg.GetCommsID() {
filterdNets = append(filterdNets, networks[i])
}
}
return filterdNets
}

2
logic/nodes.go
View file

@ -573,7 +573,7 @@ func IsLocalServer(node *models.Node) bool {
// IsNodeInComms returns if node is in comms network or not
func IsNodeInComms(node *models.Node) bool {
return node.Network == servercfg.GetCommsID()
return node.Network == servercfg.GetCommsID() && node.IsServer != "yes"
}
// validateServer - make sure servers dont change port or address