diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-04-26 15:39:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 15:39:36 +0200 |
| commit | d1b7dfbe0841bbfb94a72fe6ea46ae9d059b5230 (patch) | |
| tree | 552f62cac319f7a58ea3cf56638fff243bf5b6a8 /pimd/pim_cmd.c | |
| parent | a22e6a63c4c821929fd6805b69aae85fd71111b3 (diff) | |
| parent | eed4433df448148feec30c4b74877199f76c1b95 (diff) | |
Merge pull request #10712 from patrasar/pim_nexthop_prefix_to_pimaddr
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index ba39593603..2deb6e0952 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3525,7 +3525,6 @@ DEFPY (show_ip_pim_nexthop_lookup, pim_addr vif_source; struct prefix grp; struct pim_nexthop nexthop; - char nexthop_addr_str[PREFIX_STRLEN]; struct vrf *v; v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); @@ -3560,10 +3559,8 @@ DEFPY (show_ip_pim_nexthop_lookup, return CMD_SUCCESS; } - pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr, - nexthop_addr_str, sizeof(nexthop_addr_str)); - vty_out(vty, "Group %s --- Nexthop %s Interface %s \n", group_str, - nexthop_addr_str, nexthop.interface->name); + vty_out(vty, "Group %s --- Nexthop %pPAs Interface %s \n", group_str, + &nexthop.mrib_nexthop_addr, nexthop.interface->name); return CMD_SUCCESS; } @@ -4680,7 +4677,6 @@ DEFUN (show_ip_rib, struct in_addr addr; const char *addr_str; struct pim_nexthop nexthop; - char nexthop_addr_str[PREFIX_STRLEN]; int result; if (!vrf) @@ -4706,10 +4702,8 @@ DEFUN (show_ip_rib, vty_out(vty, "Address NextHop Interface Metric Preference\n"); - pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr, - nexthop_addr_str, sizeof(nexthop_addr_str)); - - vty_out(vty, "%-15s %-15s %-9s %6d %10d\n", addr_str, nexthop_addr_str, + vty_out(vty, "%-15s %-15pPAs %-9s %6d %10d\n", addr_str, + &nexthop.mrib_nexthop_addr, nexthop.interface ? nexthop.interface->name : "<ifname?>", nexthop.mrib_route_metric, nexthop.mrib_metric_preference); |