From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 7 Sep 2016 14:34:02 +0000 (-0400)
Subject: pimd: Fix display of rp information in 'show run'
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~241
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=60ce8d9b4c7e5d807f29f0a301b6237377bce884;p=matthieu%2Ffrr.git

pimd: Fix display of rp information in 'show run'

The recent conversion of in_addr_t to struct prefix
caused a display issue in the 'show run' of the rp.

Ticket: CM-12752
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 612c08e1b7..daf825f6d8 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -441,7 +441,7 @@ pim_rp_config_write (struct vty *vty)
       if (!pim_rpf_addr_is_inaddr_none (&rp_info->rp))
         {
 	  char buf[32];
-          vty_out(vty, "ip pim rp %s %s%s", inet_ntop(AF_INET, &rp_info->rp.rpf_addr, buffer, 32),
+          vty_out(vty, "ip pim rp %s %s%s", inet_ntop(AF_INET, &rp_info->rp.rpf_addr.u.prefix4, buffer, 32),
 		  prefix2str(&rp_info->group, buf, 32), VTY_NEWLINE);
           count++;
         }