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

Merge pull request #1235 from chiragshah6/ospf_vrf_dev

Browse Source 
zebra: Nexthop APIs to use correct vrf_id
This commit is contained in:
Renato Westphal 2017-09-26 00:34:04 -03:00 committed by GitHub
commit 8a38c34b5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/zebra_rib.c
View File

@ -261,7 +261,7 @@ struct nexthop *route_entry_nexthop_ipv4_ifindex_add(struct route_entry *re,
if (src) if (src)
nexthop->src.ipv4 = *src; nexthop->src.ipv4 = *src;
nexthop->ifindex = ifindex; nexthop->ifindex = ifindex;
ifp = if_lookup_by_index(nexthop->ifindex, VRF_DEFAULT); ifp = if_lookup_by_index(nexthop->ifindex, re->vrf_id);
/*Pending: need to think if null ifp here is ok during bootup? /*Pending: need to think if null ifp here is ok during bootup?
There was a crash because ifp here was coming to be NULL */ There was a crash because ifp here was coming to be NULL */
if (ifp) if (ifp)
@ -417,7 +417,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
* address in the routing table. * address in the routing table.
*/ */
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) { if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) {
ifp = if_lookup_by_index(nexthop->ifindex, VRF_DEFAULT); ifp = if_lookup_by_index(nexthop->ifindex, re->vrf_id);
if (ifp && connected_is_unnumbered(ifp)) { if (ifp && connected_is_unnumbered(ifp)) {
if (if_is_operative(ifp)) if (if_is_operative(ifp))
return 1; return 1;