zebra: Use the correct vrf id to lookup the ifp pointer

Use the nexthop vrf_id to properly lookup the ifp pointer
for display purposes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 8caa39427bd7ff24d818c6694386279b520370f9..6f9b8559089c2d2e799f225d8b054a910a855e4b 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -911,7 +911,8 @@ static unsigned nexthop_active_check(struct route_node *rn,
                        zlog_debug(
                                "%u:%s: Filtering out with NH out %s due to route map",
                                re->vrf_id, buf,
-                               ifindex2ifname(nexthop->ifindex, re->vrf_id));
+                               ifindex2ifname(nexthop->ifindex,
+                                              re->nh_vrf_id));
                }
                UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
        }

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 82b0157ad377ae8cca95fff71f6af55549d49c73..a0d2930c89aed46f15d30888d882e8372a166e27 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -539,7 +539,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
                                if (nexthop->ifindex)
                                        vty_out(vty, ", via %s",
                                                ifindex2ifname(nexthop->ifindex,
-                                                              re->vrf_id));
+                                                              re->nh_vrf_id));
                                break;
                        case NEXTHOP_TYPE_IPV6:
                        case NEXTHOP_TYPE_IPV6_IFINDEX:
@@ -549,12 +549,12 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
                                if (nexthop->ifindex)
                                        vty_out(vty, ", via %s",
                                                ifindex2ifname(nexthop->ifindex,
-                                                              re->vrf_id));
+                                                              re->nh_vrf_id));
                                break;
                        case NEXTHOP_TYPE_IFINDEX:
                                vty_out(vty, " directly connected, %s",
                                        ifindex2ifname(nexthop->ifindex,
-                                                      re->vrf_id));
+                                                      re->nh_vrf_id));
                                break;
                        case NEXTHOP_TYPE_BLACKHOLE:
                                vty_out(vty, " unreachable");
@@ -715,7 +715,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
                                        json_object_string_add(
                                                json_nexthop, "interfaceName",
                                                ifindex2ifname(nexthop->ifindex,
-                                                              re->vrf_id));
+                                                              re->nh_vrf_id));
                                }
                                break;
                        case NEXTHOP_TYPE_IPV6:
@@ -734,7 +734,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
                                        json_object_string_add(
                                                json_nexthop, "interfaceName",
                                                ifindex2ifname(nexthop->ifindex,
-                                                              re->vrf_id));
+                                                              re->nh_vrf_id));
                                }
                                break;
 
@@ -747,7 +747,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
                                json_object_string_add(
                                        json_nexthop, "interfaceName",
                                        ifindex2ifname(nexthop->ifindex,
-                                                      re->vrf_id));
+                                                      re->nh_vrf_id));
                                break;
                        case NEXTHOP_TYPE_BLACKHOLE:
                                json_object_boolean_true_add(json_nexthop,
@@ -881,7 +881,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
                        if (nexthop->ifindex)
                                vty_out(vty, ", %s",
                                        ifindex2ifname(nexthop->ifindex,
-                                                      re->vrf_id));
+                                                      re->nh_vrf_id));
                        break;
                case NEXTHOP_TYPE_IPV6:
                case NEXTHOP_TYPE_IPV6_IFINDEX:
@@ -891,12 +891,13 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
                        if (nexthop->ifindex)
                                vty_out(vty, ", %s",
                                        ifindex2ifname(nexthop->ifindex,
-                                                      re->vrf_id));
+                                                      re->nh_vrf_id));
                        break;
 
                case NEXTHOP_TYPE_IFINDEX:
                        vty_out(vty, " is directly connected, %s",
-                               ifindex2ifname(nexthop->ifindex, re->vrf_id));
+                               ifindex2ifname(nexthop->ifindex,
+                                              re->nh_vrf_id));
                        break;
                case NEXTHOP_TYPE_BLACKHOLE:
                        vty_out(vty, " unreachable");