Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / pimd / pim_bsm.c

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index b36e006311aeb857d92894d6000484fb0bb24857..df9161943d378544722032c4d1e60c7777a9471f 100644 (file)
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -156,7 +156,6 @@ static void pim_on_bs_timer(struct event *t)
 
        pim_nht_bsr_del(scope->pim, scope->current_bsr);
        /* Reset scope zone data */
-       scope->accept_nofwd_bsm = false;
        scope->state = ACCEPT_ANY;
        scope->current_bsr = PIMADDR_ANY;
        scope->current_bsr_prio = 0;
@@ -1364,6 +1363,10 @@ int pim_bsm_process(struct interface *ifp, pim_sgaddr *sg, uint8_t *buf,
                }
        }
 
+       /* BSM packet is seen, so resetting accept_nofwd_bsm to false */
+       if (pim->global_scope.accept_nofwd_bsm)
+               pim->global_scope.accept_nofwd_bsm = false;
+
        if (!pim_addr_cmp(sg->grp, qpim_all_pim_routers_addr)) {
                /* Multicast BSMs are only accepted if source interface & IP
                 * match RPF towards the BSR's IP address, or they have