diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2021-06-30 04:35:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 04:35:38 +0000 |
| commit | 309f6af6054f915c061f738d7a97801e1166ea22 (patch) | |
| tree | d0cce88901c381ba4f2de830a46cb9f9eeb158a7 /pimd/pim_cmd.c | |
| parent | 5e02b133bfe4c0b769658de6b8bc295b99fc12b7 (diff) | |
| parent | 530b12cf6e88170d4f6d4f10a8bd95de0284866e (diff) | |
Merge pull request #8952 from Jafaral/show-ip-mroute
pimd: make show ip mroute output consistent
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index b3d4444652..98eab9b694 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -6323,7 +6323,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, if (!uj && !found_oif) { vty_out(vty, - "%-15s %-15s %-15s %-6s %-16s %-16s %-3d %8s\n", + "%-15s %-15s %-8s %-6s %-16s %-16s %-3d %8s\n", src_str, grp_str, state_str, "none", in_ifname, "none", 0, "--:--:--"); } @@ -6430,10 +6430,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, json_ifp_out); } else { vty_out(vty, - "%-15s %-15s %-6s %-16s %-16s %-3d %8s %s\n", - src_str, grp_str, proto, in_ifname, - out_ifname, ttl, oif_uptime, - pim->vrf->name); + "%-15s %-15s %-8s %-6s %-16s %-16s %-3d %8s\n", + src_str, grp_str, "-", proto, in_ifname, + out_ifname, ttl, oif_uptime); if (first && !fill) { src_str[0] = '\0'; grp_str[0] = '\0'; @@ -6445,9 +6444,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, if (!uj && !found_oif) { vty_out(vty, - "%-15s %-15s %-6s %-16s %-16s %-3d %8s %s\n", - src_str, grp_str, proto, in_ifname, "none", 0, - "--:--:--", pim->vrf->name); + "%-15s %-15s %-8s %-6s %-16s %-16s %-3d %8s\n", + src_str, grp_str, "-", proto, in_ifname, "none", + 0, "--:--:--"); } } |