simplify acl map

logic/acls.go

@@ -674,7 +674,7 @@ func RemoveDeviceTagFromAclPolicies(tagID models.TagID, netID models.NetworkID)
 	return nil
 }
 
-func GetAclRulesForNode(node *models.Node) (rules map[string][]models.AclRule) {
+func GetAclRulesForNode(node *models.Node, rules map[string][]models.AclRule) map[string][]models.AclRule {
 	defaultPolicy, err := GetDefaultPolicy(models.NetworkID(node.Network), models.DevicePolicy)
 	rules = make(map[string][]models.AclRule)
 	if err == nil && defaultPolicy.Enabled {
@@ -822,5 +822,5 @@ func GetAclRulesForNode(node *models.Node) (rules map[string][]models.AclRule) {
 			}
 		}
 	}
-	return
+	return rules
 }

logic/peers.go

@@ -76,7 +76,7 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 		FwUpdate: models.FwUpdate{
 			EgressInfo:  make(map[string]models.EgressInfo),
 			IngressInfo: make(map[string]models.IngressInfo),
-			AclRules:    make(map[string]map[string][]models.AclRule),
+			AclRules:    make(map[string][]models.AclRule),
 		},
 		PeerIDs:           make(models.PeerMap, 0),
 		Peers:             []wgtypes.PeerConfig{},
@@ -155,7 +155,7 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 		if !hostPeerUpdate.IsInternetGw {
 			hostPeerUpdate.IsInternetGw = IsInternetGw(node)
 		}
-		hostPeerUpdate.FwUpdate.AclRules[node.Network] = GetAclRulesForNode(&node)
+		hostPeerUpdate.FwUpdate.AclRules = GetAclRulesForNode(&node, hostPeerUpdate.FwUpdate.AclRules)
 		currentPeers := GetNetworkNodesMemory(allNodes, node.Network)
 		for _, peer := range currentPeers {
 			peer := peer

models/mqtt.go

@@ -90,11 +90,11 @@ type KeyUpdate struct {
 
 // FwUpdate - struct for firewall updates
 type FwUpdate struct {
-	IsEgressGw  bool                            `json:"is_egress_gw"`
-	IsIngressGw bool                            `json:"is_ingress_gw"`
-	EgressInfo  map[string]EgressInfo           `json:"egress_info"`
-	IngressInfo map[string]IngressInfo          `json:"ingress_info"`
-	AclRules    map[string]map[string][]AclRule `json:"acl_rules"`
+	IsEgressGw  bool                   `json:"is_egress_gw"`
+	IsIngressGw bool                   `json:"is_ingress_gw"`
+	EgressInfo  map[string]EgressInfo  `json:"egress_info"`
+	IngressInfo map[string]IngressInfo `json:"ingress_info"`
+	AclRules    map[string][]AclRule   `json:"acl_rules"`
 }
 
 // FailOverMeReq - struct for failover req