From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Nov 2016 12:55:51 +0000 (-0500)
Subject: pimd: 'show ip pim join json' add by src not grp
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~118
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=11757d7b98876be9c3a21e04dcecd93113081ffa;p=mirror%2Ffrr.git

pimd: 'show ip pim join json' add by src not grp

If you add to the json by grp, if you have multiple
ifchannels for that group, on the the first one will
be displayed.

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 23e8ebd77c..8120d32132 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1142,7 +1142,7 @@ static void pim_show_join(struct vty *vty, u_char uj)
       json_object_string_add(json_row, "expire", expire);
       json_object_string_add(json_row, "prune", prune);
       json_object_string_add(json_row, "channelJoinName", pim_ifchannel_ifjoin_name(ch->ifjoin_state));
-      json_object_object_add(json_iface, ch_grp_str, json_row);
+      json_object_object_add(json_iface, ch_src_str, json_row);
 
     } else {
       vty_out(vty, "%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s%s",