proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 09:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pim6d: Don't display MLD disabled or down interfaces in "show ipv6 mld interface" cmd

Browse Source 
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>
(cherry picked from commit fe4db62c3d)
This commit is contained in:
Sarita Patra 2023-02-24 07:01:22 -08:00 committed by Mergify
parent 63b643d1cf
commit aa3f3511de
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pimd/pim6_mld.c
View File

@ -2399,14 +2399,6 @@ static void gm_show_if_one(struct vty *vty, struct interface *ifp,
struct gm_if *gm_ifp = pim_ifp->mld; struct gm_if *gm_ifp = pim_ifp->mld;
bool querier; 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); querier = IPV6_ADDR_SAME(&gm_ifp->querier, &pim_ifp->ll_lowest);
if (js_if) { if (js_if) {
@ -2450,6 +2442,7 @@ static void gm_show_if_vrf(struct vty *vty, struct vrf *vrf, const char *ifname,
{ {
struct interface *ifp; struct interface *ifp;
json_object *js_vrf; json_object *js_vrf;
struct pim_interface *pim_ifp;
if (js) { if (js) {
js_vrf = json_object_new_object(); js_vrf = json_object_new_object();
@ -2466,8 +2459,11 @@ static void gm_show_if_vrf(struct vty *vty, struct vrf *vrf, const char *ifname,
continue; continue;
} }
if (!ifp->info) pim_ifp = ifp ->info;
if (!pim_ifp || !pim_ifp->mld)
continue; continue;
if (js) { if (js) {
js_if = json_object_new_object(); js_if = json_object_new_object();
json_object_object_add(js_vrf, ifp->name, js_if); json_object_object_add(js_vrf, ifp->name, js_if);