commit 5b9f51828db732d56053500b1d257797f7f3401b
author Christian Franke <chris@opensourcerouting.org> Sat May 25 14:01:34 2013 +0000
committer David Lamparter <equinox@opensourcerouting.org> Tue Aug 06 12:41:46 2013 +0200
tree d5f43ef09d6a8df6a2eef852bd61020c27395125
parent a0f6ce5b41dcfa059074d72c8fc61896d3e996a9

zebra: improve display of NEXTHOP_IPV4_IFINDEX in show ip route

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

zebra/zebra_vty.c

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index d07b09c..a672d42 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -621,7 +621,11 @@
 		{
 		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 @@
 	    {
 	    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: