diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2025-01-14 14:02:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 14:02:17 -0600 |
| commit | ddff9fb528b1686d75ab5038477a9178664f0149 (patch) | |
| tree | 014a436d35c0a9a360c898077445566579a04734 /pimd | |
| parent | 710e0047c2c189eb98b5ca73e9fece7569848592 (diff) | |
| parent | 6cf5c65ad18b261172f31ed2b35c42d4677c908c (diff) | |
Merge pull request #17857 from FRRouting/mergify/bp/stable/10.2/pr-17850
pimd: always write cand-rp group config even when rp is inactive (backport #17850)
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_bsm.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c index 5a194e3119..6c7a826d9e 100644 --- a/pimd/pim_bsm.c +++ b/pimd/pim_bsm.c @@ -2174,6 +2174,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) { @@ -2185,14 +2186,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) { |