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)
FRRouting · Jan 14, 2025 · ddff9fb · ddff9fb
2 parents 710e004 + 6cf5c65
commit ddff9fb
Showing 1 changed file with 5 additions and 7 deletions.
diff --git 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) {