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

Merge pull request #13467 from patrasar/pimv6_state_fix

Browse Source 
pim6d: "show ipv6 pim state" not displaying when OIL is empty
This commit is contained in:
Donatas Abraitis 2023-07-04 21:37:20 +03:00 committed by GitHub
commit ae2f167596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pimd/pim_cmd_common.c
View File

@ -1148,13 +1148,18 @@ void pim_show_state(struct pim_instance *pim, struct vty *vty,
"wrongInterface", "wrongInterface",
c_oil->cc.wrong_if); c_oil->cc.wrong_if);
} }
} } else
#if PIM_IPV == 4 #if PIM_IPV == 4
else
vty_out(vty, "%-6d %-15pPAs %-15pPAs %-3s %-16s ", vty_out(vty, "%-6d %-15pPAs %-15pPAs %-3s %-16s ",
c_oil->installed, oil_origin(c_oil), c_oil->installed, oil_origin(c_oil),
oil_mcastgrp(c_oil), isRpt ? "y" : "n", oil_mcastgrp(c_oil), isRpt ? "y" : "n",
in_ifname); in_ifname);
#else
/* Add a new row for c_oil with no OIF */
ttable_add_row(tt, "%d|%pPAs|%pPAs|%s|%s|%c",
c_oil->installed, oil_origin(c_oil),
oil_mcastgrp(c_oil), isRpt ? "y" : "n",
in_ifname, ' ');
#endif #endif
for (oif_vif_index = 0; oif_vif_index < MAXVIFS; for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
@ -1225,6 +1230,13 @@ void pim_show_state(struct pim_instance *pim, struct vty *vty,
#if PIM_IPV == 4 #if PIM_IPV == 4
vty_out(vty, "%s%s", out_ifname, flag); vty_out(vty, "%s%s", out_ifname, flag);
#else #else
/* OIF found.
* Delete the existing row for c_oil,
* with no OIF.
* Add a new row for c_oil with OIF and
* flag.
*/
ttable_del_row(tt, tt->nrows - 1);
ttable_add_row( ttable_add_row(
tt, "%d|%pPAs|%pPAs|%s|%s|%s%s", tt, "%d|%pPAs|%pPAs|%s|%s|%s%s",
c_oil->installed, c_oil->installed,