From 18cfdfd2ad371aed22b13c61dafc107f70823dc1 Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Thu, 10 Mar 2022 14:55:25 -0500 Subject: [PATCH] added server update on ACL update --- controllers/network.go | 5 ++++- logic/peers.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/controllers/network.go b/controllers/network.go index 74182a44..bcec614c 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -255,10 +255,13 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) { // send peer updates if servercfg.IsMessageQueueBackend() { - serverNode, err := logic.GetNetworkServerLeader(netname) + serverNode, err := logic.GetNetworkServerLocal(netname) if err != nil { logger.Log(1, "failed to find server node after ACL update on", netname) } else { + if err = logic.ServerUpdate(&serverNode, false); err != nil { + logger.Log(1, "failed to update server node after ACL update on", netname) + } if err = mq.PublishPeerUpdate(&serverNode); err != nil { logger.Log(0, "failed to publish peer update after ACL update on", netname) } diff --git a/logic/peers.go b/logic/peers.go index e78c7294..a18d5a74 100644 --- a/logic/peers.go +++ b/logic/peers.go @@ -86,7 +86,7 @@ func GetNodePeers(networkName, nodeid string, excludeRelayed bool, isP2S bool) ( } } } - if !isP2S || peer.IsHub == "yes" && currentNetworkACLs.IsAllowed(acls.AclID(nodeid), acls.AclID(node.ID)) { + if (!isP2S || peer.IsHub == "yes") && currentNetworkACLs.IsAllowed(acls.AclID(nodeid), acls.AclID(node.ID)) { peers = append(peers, peer) } }