From: Jafar Al-Gharaibeh <jafar@atcorp.com>
Date: Tue, 14 Jan 2025 05:34:08 +0000 (-0600)
Subject: pimd: always write cand-rp group config even when rp is inactive
X-Git-Tag: docker/10.2.2~45^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F17857%2Fhead;p=mirror%2Ffrr.git

pimd: always write cand-rp group config even when rp is inactive

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 8e66f821bf8d53603eb3fa4d30fedf5ad5ae52aa)
---

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index a44e4e08f3..b3807c6500 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -2169,6 +2169,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) {
@@ -2180,14 +2181,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) {