diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-04 21:37:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 21:37:20 +0300 |
| commit | ae2f167596d5e303d670ab65b22e7eb97324a22e (patch) | |
| tree | f09d6ea31899a7f05b714879ad6b852f5d968f85 /pimd | |
| parent | c41151224610ebef6ede2ebce00987a72408e1c1 (diff) | |
| parent | 49a6c85563c55ce44237b0db532471267b6d1da3 (diff) | |
Merge pull request #13467 from patrasar/pimv6_state_fix
pim6d: "show ipv6 pim state" not displaying when OIL is empty
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_cmd_common.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 5b905a9536..6af19cadd7 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1148,13 +1148,18 @@ void pim_show_state(struct pim_instance *pim, struct vty *vty, "wrongInterface", c_oil->cc.wrong_if); } - } + } else #if PIM_IPV == 4 - else vty_out(vty, "%-6d %-15pPAs %-15pPAs %-3s %-16s ", c_oil->installed, oil_origin(c_oil), oil_mcastgrp(c_oil), isRpt ? "y" : "n", 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 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 vty_out(vty, "%s%s", out_ifname, flag); #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( tt, "%d|%pPAs|%pPAs|%s|%s|%s%s", c_oil->installed, |