From 0c3182a08db7b4f2d171f8bf67c7815c36379a13 Mon Sep 17 00:00:00 2001 From: Mobashshera Rasool Date: Sun, 6 Mar 2022 23:34:19 -0800 Subject: [PATCH] pim6d: Adding the rp clis to show-running Modify the pim_rp_config_write api for pimv4/pimv6. Signed-off-by: Mobashshera Rasool --- pimd/pim_rp.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 06b2216072..87e83ededf 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -1176,8 +1176,8 @@ int pim_rp_config_write(struct pim_instance *pim, struct vty *vty, { struct listnode *node; struct rp_info *rp_info; - char rp_buffer[32]; int count = 0; + pim_addr rp_addr; for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) { if (pim_rpf_addr_is_inaddr_any(&rp_info->rp)) @@ -1186,18 +1186,15 @@ int pim_rp_config_write(struct pim_instance *pim, struct vty *vty, if (rp_info->rp_src == RP_SRC_BSR) continue; + rp_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr); if (rp_info->plist) - vty_out(vty, "%sip pim rp %s prefix-list %s\n", spaces, - inet_ntop(AF_INET, - &rp_info->rp.rpf_addr.u.prefix4, - rp_buffer, 32), - rp_info->plist); + vty_out(vty, + "%s" PIM_AF_NAME + " pim rp %pPA prefix-list %s\n", + spaces, &rp_addr, rp_info->plist); else - vty_out(vty, "%sip pim rp %s %pFX\n", spaces, - inet_ntop(AF_INET, - &rp_info->rp.rpf_addr.u.prefix4, - rp_buffer, 32), - &rp_info->group); + vty_out(vty, "%s" PIM_AF_NAME " pim rp %pPA %pFX\n", + spaces, &rp_addr, &rp_info->group); count++; } -- 2.39.5