Merge pull request #17850 from Jafaral/wr-rpg

pimd: always write cand-rp group config even when rp is inactive
This commit is contained in:
Donald Sharp 2025-01-14 12:41:15 -05:00 committed by GitHub
commit a6595fde70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2170,6 +2170,7 @@ static void cand_addrsel_config_write(struct vty *vty,
int pim_cand_config_write(struct pim_instance *pim, struct vty *vty)
{
struct bsm_scope *scope = &pim->global_scope;
struct cand_rp_group *group;
int ret = 0;
if (scope->cand_rp_addrsel.cfg_enable) {
@ -2181,14 +2182,11 @@ int pim_cand_config_write(struct pim_instance *pim, struct vty *vty)
cand_addrsel_config_write(vty, &scope->cand_rp_addrsel);
vty_out(vty, "\n");
ret++;
}
struct cand_rp_group *group;
frr_each (cand_rp_groups, scope->cand_rp_groups, group) {
vty_out(vty, " bsr candidate-rp group %pFX\n",
&group->p);
ret++;
}
frr_each (cand_rp_groups, scope->cand_rp_groups, group) {
vty_out(vty, " bsr candidate-rp group %pFX\n", &group->p);
ret++;
}
if (scope->bsr_addrsel.cfg_enable) {