Browse Source

fix ext-ext comms

abhishek9686 6 months ago
parent
commit
6e1b16a6ea
1 changed files with 6 additions and 2 deletions
  1. 6 2
      logic/extpeers.go

+ 6 - 2
logic/extpeers.go

@@ -685,10 +685,14 @@ func GetFwRulesOnIngressGateway(node models.Node) (rules []models.FwRule) {
 			if peer.StaticNode.ClientID == nodeI.StaticNode.ClientID || peer.IsUserNode {
 			if peer.StaticNode.ClientID == nodeI.StaticNode.ClientID || peer.IsUserNode {
 				continue
 				continue
 			}
 			}
-			if nodeI.StaticNode.IngressGatewayID != node.ID.String() && peer.ID.String() != node.ID.String() {
+			if nodeI.StaticNode.IngressGatewayID != node.ID.String() &&
+				((!peer.IsStatic && peer.ID.String() != node.ID.String()) ||
+					(peer.IsStatic && peer.StaticNode.IngressGatewayID != node.ID.String())) {
 				continue
 				continue
 			}
 			}
-
+			if peer.IsStatic {
+				peer = peer.StaticNode.ConvertToStaticNode()
+			}
 			if ok, allowedPolicies := IsNodeAllowedToCommunicateV1(nodeI.StaticNode.ConvertToStaticNode(), peer, true); ok {
 			if ok, allowedPolicies := IsNodeAllowedToCommunicateV1(nodeI.StaticNode.ConvertToStaticNode(), peer, true); ok {
 				rules = append(rules, getFwRulesForNodeAndPeerOnGw(nodeI.StaticNode.ConvertToStaticNode(), peer, allowedPolicies)...)
 				rules = append(rules, getFwRulesForNodeAndPeerOnGw(nodeI.StaticNode.ConvertToStaticNode(), peer, allowedPolicies)...)
 			}
 			}