proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 03:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6421 from vivek-cumulus/zebra_trust_onlink

Browse Source 
zebra: Trust onlink flag for nexthop active resolution
This commit is contained in:
Russ White 2020-05-18 17:23:57 -04:00 committed by GitHub
commit 3bb8051aa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zapi_msg.c
View File

@ -1451,10 +1451,6 @@ static struct nexthop *nexthop_from_zapi(struct route_entry *re,
&api_nh->gate.ipv4, NULL, api_nh->ifindex, &api_nh->gate.ipv4, NULL, api_nh->ifindex,
api_nh->vrf_id); api_nh->vrf_id);
ifp = if_lookup_by_index(api_nh->ifindex, api_nh->vrf_id);
if (ifp && connected_is_unnumbered(ifp))
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK);
/* Special handling for IPv4 routes sourced from EVPN: /* Special handling for IPv4 routes sourced from EVPN:
* the nexthop and associated MAC need to be installed. * the nexthop and associated MAC need to be installed.
*/ */
@ -1516,8 +1512,16 @@ static struct nexthop *nexthop_from_zapi(struct route_entry *re,
goto done; goto done;
} }
/* Mark nexthop as onlink either if client has explicitly told us
* to or if the nexthop is on an 'unnumbered' interface.
*/
if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_ONLINK)) if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_ONLINK))
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK); SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK);
else if (api_nh->type == NEXTHOP_TYPE_IPV4_IFINDEX) {
ifp = if_lookup_by_index(api_nh->ifindex, api_nh->vrf_id);
if (ifp && connected_is_unnumbered(ifp))
SET_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK);
}
if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_WEIGHT)) if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_WEIGHT))
nexthop->weight = api_nh->weight; nexthop->weight = api_nh->weight;

29
zebra/zebra_nhg.c
View File

@ -1776,33 +1776,24 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
return 1; return 1;
/* /*
* Check to see if we should trust the passed in information * If the nexthop has been marked as 'onlink' we just need to make
* for UNNUMBERED interfaces as that we won't find the GW * sure the nexthop's interface is known and is operational.
* address in the routing table.
* This check should suffice to handle IPv4 or IPv6 routes
* sourced from EVPN routes which are installed with the
* next hop as the remote VTEP IP.
*/ */
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) { if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) {
ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id); ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id);
if (!ifp) { if (!ifp) {
if (IS_ZEBRA_DEBUG_RIB_DETAILED) if (IS_ZEBRA_DEBUG_NHG_DETAIL)
zlog_debug( zlog_debug("nexthop %pNHv marked onlink but nhif %u doesn't exist",
" %s: Onlink and interface: %u[%u] does not exist", nexthop, nexthop->ifindex);
__func__, nexthop->ifindex,
nexthop->vrf_id);
return 0; return 0;
} }
if (!if_is_operative(ifp)) {
if (if_is_operative(ifp)) if (IS_ZEBRA_DEBUG_NHG_DETAIL)
return 1; zlog_debug("nexthop %pNHv marked onlink but nhif %s is not operational",
else { nexthop, ifp->name);
if (IS_ZEBRA_DEBUG_RIB_DETAILED)
zlog_debug(
" %s: Onlink and interface %s is not operative",
__func__, ifp->name);
return 0; return 0;
} }
return 1;
} }
if ((top->p.family == AF_INET && top->p.prefixlen == 32 if ((top->p.family == AF_INET && top->p.prefixlen == 32