matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18048 from opensourcerouting/msdpt3f

Browse source 
pimd: fix DR election race on startup
This commit is contained in:
Jafar Al-Gharaibeh 2025-02-06 21:40:45 -06:00 committed by GitHub
parent fd66ede08b 8644524606
commit 452732024e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pimd/pim_nb_config.c
View file

@ -2043,6 +2043,11 @@ int lib_interface_pim_address_family_pim_enable_modify(struct nb_cb_modify_args
ifp->name); ifp->name);
return NB_ERR_INCONSISTENCY; 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 { } else {
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) if (!pim_ifp)
@ -2076,6 +2081,10 @@ int lib_interface_pim_address_family_pim_passive_enable_modify(
pim_ifp = ifp->info; pim_ifp = ifp->info;
pim_ifp->pim_passive_enable = pim_ifp->pim_passive_enable =
yang_dnode_get_bool(args->dnode, NULL); 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; break;
} }