proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 19:02:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-01-08 09:56:08 -05:00
parent 8f43b4d886
commit 99b9d9609f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zebra/zebra_rib.c
View File

@ -911,7 +911,8 @@ static unsigned nexthop_active_check(struct route_node *rn,
zlog_debug( zlog_debug(
"%u:%s: Filtering out with NH out %s due to route map", "%u:%s: Filtering out with NH out %s due to route map",
re->vrf_id, buf, re->vrf_id, buf,
ifindex2ifname(nexthop->ifindex, re->vrf_id)); ifindex2ifname(nexthop->ifindex,
re->nh_vrf_id));
} }
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE); UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
} }

19
zebra/zebra_vty.c
View File

@ -539,7 +539,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
if (nexthop->ifindex) if (nexthop->ifindex)
vty_out(vty, ", via %s", vty_out(vty, ", via %s",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX: 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) if (nexthop->ifindex)
vty_out(vty, ", via %s", vty_out(vty, ", via %s",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
vty_out(vty, " directly connected, %s", vty_out(vty, " directly connected, %s",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
vty_out(vty, " unreachable"); 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_object_string_add(
json_nexthop, "interfaceName", json_nexthop, "interfaceName",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
} }
break; break;
case NEXTHOP_TYPE_IPV6: 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_object_string_add(
json_nexthop, "interfaceName", json_nexthop, "interfaceName",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
} }
break; break;
@ -747,7 +747,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
json_object_string_add( json_object_string_add(
json_nexthop, "interfaceName", json_nexthop, "interfaceName",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
json_object_boolean_true_add(json_nexthop, 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) if (nexthop->ifindex)
vty_out(vty, ", %s", vty_out(vty, ", %s",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX: 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) if (nexthop->ifindex)
vty_out(vty, ", %s", vty_out(vty, ", %s",
ifindex2ifname(nexthop->ifindex, ifindex2ifname(nexthop->ifindex,
re->vrf_id)); re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
vty_out(vty, " is directly connected, %s", vty_out(vty, " is directly connected, %s",
ifindex2ifname(nexthop->ifindex, re->vrf_id)); ifindex2ifname(nexthop->ifindex,
re->nh_vrf_id));
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
vty_out(vty, " unreachable"); vty_out(vty, " unreachable");