Fixes #1365 multicast duplication issue

Fix qdr_forward_multicast_CT to check valid_origins. Fixes #1365
skupperproject · Nov 26, 2024 · 88482c5 · 88482c5
1 parent b478fb5
commit 88482c5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/router_core/forwarder.c b/src/router_core/forwarder.c
@@ -631,7 +631,9 @@ int qdr_forward_multicast_CT(qdr_core_t      *core,
 
             // get the inter-router connection associated with path to rnode:
             int conn_bit = (rnode->next_hop) ? rnode->next_hop->conn_mask_bit : rnode->conn_mask_bit;
-            if (conn_bit >= 0 && (!link_exclusion || qd_bitmask_value(link_exclusion, conn_bit) == 0)) {
+
+            if (conn_bit >= 0 && (!link_exclusion || qd_bitmask_value(link_exclusion, conn_bit) == 0) &&
+		(bypass_valid_origins || qd_bitmask_value(rnode->valid_origins, origin))) {
                 qd_bitmask_set_bit(conn_set, conn_bit);
             }
         }