zebra: Use the passed in nexthops vrf

When decoding and creating the appropriate data structures
for a nexthop, use the passed in vrf.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-02-28 18:55:10 -05:00
parent 4ca997a8f8
commit c7bacffe46

View File

@ -1166,12 +1166,12 @@ static int zread_route_add(struct zserv *client, u_short length,
switch (api_nh->type) { switch (api_nh->type) {
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
nexthop = route_entry_nexthop_ifindex_add( nexthop = route_entry_nexthop_ifindex_add(
re, api_nh->ifindex, re->vrf_id); re, api_nh->ifindex, api_nh->vrf_id);
break; break;
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
nexthop = route_entry_nexthop_ipv4_add( nexthop = route_entry_nexthop_ipv4_add(
re, &api_nh->gate.ipv4, NULL, re, &api_nh->gate.ipv4, NULL,
re->vrf_id); api_nh->vrf_id);
break; break;
case NEXTHOP_TYPE_IPV4_IFINDEX: { case NEXTHOP_TYPE_IPV4_IFINDEX: {
@ -1188,7 +1188,7 @@ static int zread_route_add(struct zserv *client, u_short length,
nexthop = route_entry_nexthop_ipv4_ifindex_add( nexthop = route_entry_nexthop_ipv4_ifindex_add(
re, &api_nh->gate.ipv4, NULL, ifindex, re, &api_nh->gate.ipv4, NULL, ifindex,
re->vrf_id); api_nh->vrf_id);
/* if this an EVPN route entry, /* if this an EVPN route entry,
program the nh as neigh program the nh as neigh
@ -1211,12 +1211,12 @@ static int zread_route_add(struct zserv *client, u_short length,
} }
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
nexthop = route_entry_nexthop_ipv6_add( nexthop = route_entry_nexthop_ipv6_add(
re, &api_nh->gate.ipv6, re->vrf_id); re, &api_nh->gate.ipv6, api_nh->vrf_id);
break; break;
case NEXTHOP_TYPE_IPV6_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
nexthop = route_entry_nexthop_ipv6_ifindex_add( nexthop = route_entry_nexthop_ipv6_ifindex_add(
re, &api_nh->gate.ipv6, api_nh->ifindex, re, &api_nh->gate.ipv6, api_nh->ifindex,
re->vrf_id); api_nh->vrf_id);
break; break;
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
nexthop = route_entry_nexthop_blackhole_add( nexthop = route_entry_nexthop_blackhole_add(