proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 17:46:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18056 from FRRouting/mergify/bp/dev/10.3/pr-18048

Browse Source 
pimd: fix DR election race on startup (backport #18048)
This commit is contained in:
Donald Sharp 2025-02-12 12:39:27 -05:00 committed by GitHub
commit 45e7fc0bed
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);
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)
@ -2076,6 +2081,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;
}