From 6e1b16a6ea6dfb8372526eaa838ede6a61c906fc Mon Sep 17 00:00:00 2001 From: abhishek9686 Date: Thu, 6 Mar 2025 03:45:09 +0400 Subject: [PATCH] fix ext-ext comms --- logic/extpeers.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/logic/extpeers.go b/logic/extpeers.go index 22ba2863..1d969700 100644 --- a/logic/extpeers.go +++ b/logic/extpeers.go @@ -685,10 +685,14 @@ func GetFwRulesOnIngressGateway(node models.Node) (rules []models.FwRule) { if peer.StaticNode.ClientID == nodeI.StaticNode.ClientID || peer.IsUserNode { 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 } - + if peer.IsStatic { + peer = peer.StaticNode.ConvertToStaticNode() + } if ok, allowedPolicies := IsNodeAllowedToCommunicateV1(nodeI.StaticNode.ConvertToStaticNode(), peer, true); ok { rules = append(rules, getFwRulesForNodeAndPeerOnGw(nodeI.StaticNode.ConvertToStaticNode(), peer, allowedPolicies)...) }