]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Zebra: Fix nexthops in IPv6 route display
authorvivek <vivek@cumulusnetworks.com>
Tue, 29 Mar 2016 05:10:44 +0000 (22:10 -0700)
committervivek <vivek@cumulusnetworks.com>
Tue, 29 Mar 2016 05:21:08 +0000 (22:21 -0700)
Ticket: CM-10135
Reviewed By: Trivial
Testing Done: None

zebra/zebra_vty.c

index db6516ee2e34ffd07e102067e2a96151e5535422..5f4f49e430668e53b352d7b06b00bba71c1fb97e 100644 (file)
@@ -4523,11 +4523,12 @@ vty_show_ipv6_route_detail (struct vty *vty, struct route_node *rn)
              vty_out (vty, " %s",
                       inet_ntop (AF_INET6, &nexthop->gate.ipv6, buf, BUFSIZ));
              if (nexthop->ifindex)
-               vty_out (vty, ", via %s", ifindex2ifname (nexthop->ifindex));
+               vty_out (vty, ", via %s",
+                         ifindex2ifname_vrf (nexthop->ifindex, rib->vrf_id));
              break;
            case NEXTHOP_TYPE_IFINDEX:
              vty_out (vty, " directly connected, %s",
-                      ifindex2ifname (nexthop->ifindex));
+                       ifindex2ifname_vrf (nexthop->ifindex, rib->vrf_id));
              break;
            default:
              break;
@@ -4590,11 +4591,12 @@ vty_show_ipv6_route (struct vty *vty, struct route_node *rn,
          vty_out (vty, " via %s",
                   inet_ntop (AF_INET6, &nexthop->gate.ipv6, buf, BUFSIZ));
          if (nexthop->ifindex)
-           vty_out (vty, ", %s", ifindex2ifname (nexthop->ifindex));
+           vty_out (vty, ", %s",
+                     ifindex2ifname_vrf (nexthop->ifindex, rib->vrf_id));
          break;
        case NEXTHOP_TYPE_IFINDEX:
          vty_out (vty, " is directly connected, %s",
-                  ifindex2ifname (nexthop->ifindex));
+                   ifindex2ifname_vrf (nexthop->ifindex, rib->vrf_id));
          break;
        default:
          break;