diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-17 18:46:47 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-17 19:48:14 +0100 |
| commit | d1e77284c1ed8b5a86aadfe0485f25fa26e48e67 (patch) | |
| tree | c013e49f1e03aba3da09cf800836e76ff7f890c0 /pimd/pim_cmd.c | |
| parent | pimd: Fix connected data structure not being freed (diff) | |
| download | frr-d1e77284c1ed8b5a86aadfe0485f25fa26e48e67.tar.xz frr-d1e77284c1ed8b5a86aadfe0485f25fa26e48e67.zip | |
pimd: Add display of SGRpt state for ifchannel
When we get a SGrpt Prune embedded in the *,G Join,
Display the created ifchannel as being SGRpt state.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index a85de0aab..b2edb9471 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -1168,7 +1168,8 @@ static void pim_show_join(struct vty *vty, u_char uj) json_object_string_add(json_row, "upTime", uptime); 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_string_add(json_row, "channelJoinName", + pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags)); if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags)) json_object_int_add(json_row, "SGRpt", 1); @@ -1187,7 +1188,7 @@ static void pim_show_join(struct vty *vty, u_char uj) inet_ntoa(ifaddr), ch_src_str, ch_grp_str, - pim_ifchannel_ifjoin_name(ch->ifjoin_state), + pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags), uptime, expire, prune, |