From 5b9f51828db732d56053500b1d257797f7f3401b Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Sat, 25 May 2013 14:01:34 +0000 Subject: zebra: improve display of NEXTHOP_IPV4_IFINDEX in show ip route Signed-off-by: Christian Franke Signed-off-by: David Lamparter --- zebra/zebra_vty.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index d07b09c8..a672d422 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -621,7 +621,11 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn) { case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4_IFINDEX: - vty_out (vty, " via %s)", inet_ntoa (nexthop->rgate.ipv4)); + vty_out (vty, " via %s", inet_ntoa (nexthop->rgate.ipv4)); + if (nexthop->rifindex) + vty_out (vty, ", %s", ifindex2ifname (nexthop->rifindex)); + vty_out (vty, ")"); + break; case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFNAME: @@ -731,7 +735,10 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib) { case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4_IFINDEX: - vty_out (vty, " via %s)", inet_ntoa (nexthop->rgate.ipv4)); + vty_out (vty, " via %s", inet_ntoa (nexthop->rgate.ipv4)); + if (nexthop->rifindex) + vty_out (vty, ", %s", ifindex2ifname (nexthop->rifindex)); + vty_out (vty, ")"); break; case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFNAME: -- cgit v1.2.1