From 6f87c8f989215e48dddccfbd685e99cfc31ae3a8 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Thu, 6 Feb 2025 19:28:50 -0300 Subject: [PATCH] pimd: fix DR election race on startup In case interface address is learnt during configuration, make sure to run DR election when configuring PIM/PIM passive on interface. Signed-off-by: Rafael Zalamena (cherry picked from commit 86445246062583197d4a6dff7b8c74003cd8049d) --- pimd/pim_nb_config.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c index 637780ca0f..9a5f6f2de9 100644 --- a/pimd/pim_nb_config.c +++ b/pimd/pim_nb_config.c @@ -1755,6 +1755,11 @@ int lib_interface_pim_address_family_pim_enable_modify(struct nb_cb_modify_args ifp->name); return NB_ERR_INCONSISTENCY; } + + /* Trigger election in case it was never run before */ + pim_ifp = ifp->info; + if (pim_addr_is_any(pim_ifp->pim_dr_addr)) + pim_if_dr_election(ifp); } else { pim_ifp = ifp->info; if (!pim_ifp) @@ -1788,6 +1793,10 @@ int lib_interface_pim_address_family_pim_passive_enable_modify( pim_ifp = ifp->info; pim_ifp->pim_passive_enable = yang_dnode_get_bool(args->dnode, NULL); + + /* Trigger election in case it was never run before */ + if (pim_ifp->pim_passive_enable && pim_addr_is_any(pim_ifp->pim_dr_addr)) + pim_if_dr_election(ifp); break; } -- 2.39.5