proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 12:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix 'show ip pim join json' output

Browse Source 
When we have multiple incoming joins for
a single group on a interface, we need to
allow proper output.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-11-08 12:53:28 -05:00
parent 637a61fa2b
commit 5349cf9a09
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pimd/pim_cmd.c
View File

@ -1090,6 +1090,7 @@ static void pim_show_join(struct vty *vty, u_char uj)
json_object *json = NULL;
json_object *json_iface = NULL;
json_object *json_row = NULL;
json_object *json_grp = NULL;
now = pim_time_monotonic_sec();
@ -1144,8 +1145,16 @@ static void pim_show_join(struct vty *vty, u_char uj)
json_object_string_add(json_row, "channelJoinName", pim_ifchannel_ifjoin_name(ch->ifjoin_state));
if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
json_object_int_add(json_row, "SGRpt", 1);
json_object_object_add(json_iface, ch_src_str, json_row);
json_object_object_get_ex(json_iface, ch_grp_str, &json_grp);
if (!json_grp)
{
json_grp = json_object_new_object();
json_object_object_add(json_grp, ch_src_str, json_row);
json_object_object_add(json_iface, ch_grp_str, json_grp);
}
else
json_object_object_add(json_grp, ch_src_str, json_row);
} else {
vty_out(vty, "%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s%s",
ch->interface->name,