Skip to content

Commit

Permalink
pim6d: Don't display MLD disabled or down interfaces in "show ipv6 ml…
Browse files Browse the repository at this point in the history
…d interface" cmd

We should not display down interfaces or MLD disabled interfaces in
"show ipv6 mld interface" command.

Before fix:
==========
frr# show ipv6 mld interface
Interface         State  V  Querier                    Timer               Uptime
ens192            up     2  fe80::250:56ff:feb7:d04    query 00:00:25.432  00:00:07.038
ens224            up     1  fe80::250:56ff:feb7:a7e3   query 00:00:24.219  00:00:07.031
pim6reg            down

After fix:
=========
frr# show ipv6 mld interface
Interface         State  V  Querier                    Timer               Uptime
ens192            up     2  fe80::250:56ff:feb7:d04    query 00:00:25.432  00:00:07.038
ens224            up     1  fe80::250:56ff:feb7:a7e3   query 00:00:24.219  00:00:07.031

Issue: #11241

Signed-off-by: Sarita Patra <saritap@vmware.com>
  • Loading branch information
patrasar committed Feb 24, 2023
1 parent 2cc76c7 commit 16771ce
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions pimd/pim6_mld.c
Original file line number Diff line number Diff line change
Expand Up @@ -2386,14 +2386,6 @@ static void gm_show_if_one(struct vty *vty, struct interface *ifp,
struct gm_if *gm_ifp = pim_ifp->mld;
bool querier;

if (!gm_ifp) {
if (js_if)
json_object_string_add(js_if, "state", "down");
else
vty_out(vty, "%-16s %5s\n", ifp->name, "down");
return;
}

querier = IPV6_ADDR_SAME(&gm_ifp->querier, &pim_ifp->ll_lowest);

if (js_if) {
Expand Down Expand Up @@ -2437,6 +2429,7 @@ static void gm_show_if_vrf(struct vty *vty, struct vrf *vrf, const char *ifname,
{
struct interface *ifp;
json_object *js_vrf;
struct pim_interface *pim_ifp;

if (js) {
js_vrf = json_object_new_object();
Expand All @@ -2453,8 +2446,11 @@ static void gm_show_if_vrf(struct vty *vty, struct vrf *vrf, const char *ifname,
continue;
}

if (!ifp->info)
pim_ifp = ifp ->info;

if (!pim_ifp || !pim_ifp->mld)
continue;

if (js) {
js_if = json_object_new_object();
json_object_object_add(js_vrf, ifp->name, js_if);
Expand Down

0 comments on commit 16771ce

Please sign in to comment.