From: rgirada <rgirada@vmware.com>
Date: Mon, 30 Mar 2020 07:21:17 +0000 (-0700)
Subject: pimd: Modifying "show ip mroute json" o/p.
X-Git-Tag: base_7.5~223^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=91c0fb47798f6ab5d0506ae935bbd5964f03297d;p=matthieu%2Ffrr.git

pimd: Modifying "show ip mroute json" o/p.

Description:
"show ip mroute" displays only installed(kernel) mroutes, where
as "show ip mroute json" diplays both installed and not installed
mroutes in the o/p.To make this consistant, diplaying only valid
routes in json o/p.

Signed-off-by: Rajesh Girada <rgirada@vmware.com>
---

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 4f5b44098c..cd3f4e7128 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -5816,7 +5816,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 	frr_each (rb_pim_oil, &pim->channel_oil_head, c_oil) {
 		found_oif = 0;
 		first = 1;
-		if (!c_oil->installed && !uj)
+		if (!c_oil->installed)
 			continue;
 
 		if (sg->grp.s_addr != 0 &&