proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1914 from donaldsharp/fix_it

Browse Source 
bgpd: Move back nh_vrf setting to where it was
This commit is contained in:
paulzlabn 2018-03-17 17:20:24 -07:00 committed by GitHub
commit afe07392e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_zebra.c
View File

@ -1078,8 +1078,8 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
continue; continue;
api_nh = &api.nexthops[valid_nh_count]; api_nh = &api.nexthops[valid_nh_count];
api_nh->vrf_id = bgp->vrf_id; api_nh->vrf_id = nh_othervrf ? info->extra->bgp_orig->vrf_id
: bgp->vrf_id;
if (nh_family == AF_INET) { if (nh_family == AF_INET) {
struct in_addr *nexthop; struct in_addr *nexthop;
@ -1129,11 +1129,8 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
} }
nexthop = &mpinfo_cp->attr->nexthop; nexthop = &mpinfo_cp->attr->nexthop;
api_nh->gate.ipv4 = *nexthop; api_nh->gate.ipv4 = *nexthop;
api_nh->vrf_id = nh_othervrf
? info->extra->bgp_orig->vrf_id
: bgp->vrf_id;
/* EVPN type-2 routes are /* EVPN type-2 routes are
programmed as onlink on l3-vni SVI programmed as onlink on l3-vni SVI
*/ */
@ -1206,9 +1203,6 @@ void bgp_zebra_announce(struct bgp_node *rn, struct prefix *p,
api_nh->gate.ipv6 = *nexthop; api_nh->gate.ipv6 = *nexthop;
api_nh->ifindex = ifindex; api_nh->ifindex = ifindex;
api_nh->type = NEXTHOP_TYPE_IPV6_IFINDEX; api_nh->type = NEXTHOP_TYPE_IPV6_IFINDEX;
/* api_nh->vrf_id is not set for normal case? */
if (nh_othervrf)
api_nh->vrf_id = info->extra->bgp_orig->vrf_id;
} }
if (mpinfo->extra if (mpinfo->extra