summaryrefslogtreecommitdiff
path: root/pimd
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2025-01-14 12:41:15 -0500
committerGitHub <noreply@github.com>2025-01-14 12:41:15 -0500
commita6595fde7072c34c684d515cb298a9260ffcfca9 (patch)
treedf002651e34e2679318b40891ffe0a2c1de5665d /pimd
parent1c6cd0009d4c704433b6549cbaf6694ca648e58f (diff)
parent8e66f821bf8d53603eb3fa4d30fedf5ad5ae52aa (diff)
Merge pull request #17850 from Jafaral/wr-rpg
pimd: always write cand-rp group config even when rp is inactive
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_bsm.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 1dd54e5358..50fe543b23 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -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) {