summaryrefslogtreecommitdiffstats
path: root/pimd/pim_cmd.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2020-03-17 18:40:53 +0100
committerGitHub <noreply@github.com>2020-03-17 18:40:53 +0100
commit7967afda0799711bf4ce3bfe8b8b51ceb179376e (patch)
tree10c8375b68a214451ce4c3759311b8d37353ddd9 /pimd/pim_cmd.c
parentMerge pull request #5779 from mjstapp/sharp_with_lsps (diff)
parentpimd: fix OIL not removed after IGMP prune (diff)
downloadfrr-7967afda0799711bf4ce3bfe8b8b51ceb179376e.tar.xz
frr-7967afda0799711bf4ce3bfe8b8b51ceb179376e.zip
Merge pull request #5880 from patrasar/2371558
pimd: fix OIL not removed after IGMP prune
Diffstat (limited to 'pimd/pim_cmd.c')
-rw-r--r--pimd/pim_cmd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 7e24d924a..fc8778fd8 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1706,7 +1706,10 @@ static void pim_show_join_helper(struct vty *vty, struct pim_interface *pim_ifp,
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);
-
+ if (PIM_IF_FLAG_TEST_PROTO_PIM(ch->flags))
+ json_object_int_add(json_row, "protocolPim", 1);
+ if (PIM_IF_FLAG_TEST_PROTO_IGMP(ch->flags))
+ json_object_int_add(json_row, "protocolIgmp", 1);
json_object_object_get_ex(json_iface, ch_grp_str, &json_grp);
if (!json_grp) {
json_grp = json_object_new_object();