From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 2 Aug 2016 13:58:14 +0000 (-0400)
Subject: pimd: Add Local Genid to 'show ip pim hello'
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~326
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2a05c94c91dd05a3d3604fcd8bd7fd7edbf78c82;p=matthieu%2Ffrr.git

pimd: Add Local Genid to 'show ip pim hello'

Display the local idea of what the Genid is

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index e9ef72c637..9d1602ac40 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -614,7 +614,7 @@ static void pim_show_hello(struct vty *vty)
   
   now = pim_time_monotonic_sec();
   
-  vty_out(vty, "Interface Address         Period Timer StatStart Recv Rfail Send Sfail%s", VTY_NEWLINE);
+  vty_out(vty, "Interface Address         Period Timer StatStart Recv Rfail Send Sfail   LGenid%s", VTY_NEWLINE);
 
   for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
     struct pim_interface *pim_ifp;
@@ -637,7 +637,7 @@ static void pim_show_hello(struct vty *vty)
     pim_time_mmss(hello_period, sizeof(hello_period), pim_ifp->pim_hello_period);
     pim_time_uptime(stat_uptime, sizeof(stat_uptime), now - pim_ifp->pim_ifstat_start);
 
-    vty_out(vty, "%-9s %-15s %6s %5s %9s %4u %5u %4u %5u%s",
+    vty_out(vty, "%-9s %-15s %6s %5s %9s %4u %5u %4u %5u %08x%s",
 	    ifp->name,
 	    inet_ntoa(ifaddr),
 	    hello_period,
@@ -647,6 +647,7 @@ static void pim_show_hello(struct vty *vty)
 	    pim_ifp->pim_ifstat_hello_recvfail,
 	    pim_ifp->pim_ifstat_hello_sent,
 	    pim_ifp->pim_ifstat_hello_sendfail,
+            pim_ifp->pim_generation_id,
 	    VTY_NEWLINE);
   }
 }