Преглед на файлове

Merge pull request #3313 from gravitl/NET-1902

don't override acl rules for multi-net host
Abhishek K преди 7 месеца
родител
ревизия
7b04861476
променени са 1 файла, в които са добавени 8 реда и са изтрити 1 реда
  1. 8 1
      logic/peers.go

+ 8 - 1
logic/peers.go

@@ -187,7 +187,14 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
 
 		} else {
 			hostPeerUpdate.FwUpdate.AllowAll = false
-			hostPeerUpdate.FwUpdate.AclRules = GetAclRulesForNode(&node)
+			rules := GetAclRulesForNode(&node)
+			if len(hostPeerUpdate.FwUpdate.AclRules) == 0 {
+				hostPeerUpdate.FwUpdate.AclRules = rules
+			} else {
+				for aclID, rule := range rules {
+					hostPeerUpdate.FwUpdate.AclRules[aclID] = rule
+				}
+			}
 		}
 
 		currentPeers := GetNetworkNodesMemory(allNodes, node.Network)