mirror of
https://github.com/FRRouting/frr.git
synced 2025-04-30 13:37:17 +02:00
Merge e67616d250
into 3dd4d417be
This commit is contained in:
commit
312911cdff
|
@ -2371,6 +2371,14 @@ static void vpn_leak_to_vrf_update_onevrf(struct bgp *to_bgp, /* to */
|
|||
|
||||
bpi_ultimate = bgp_get_imported_bpi_ultimate(path_vpn);
|
||||
|
||||
/* Certain switch ASIC do not have capability for vrf leaked routes
|
||||
* to point to another VRF and perform second route lookup via chaining
|
||||
* multiple tables.
|
||||
* The routes need proper l3 interface in order to do forwarding in
|
||||
* ASIC in target VRF table.
|
||||
* Hence, moving the setting the nexthop as source vrf to a specific flag.
|
||||
*/
|
||||
#ifdef ENABLE_VRF_IFACE_NEXTHOP
|
||||
/* The nh ifindex may not be defined (when the route is
|
||||
* imported from the network statement => BGP_ROUTE_STATIC)
|
||||
* or to the real interface.
|
||||
|
@ -2385,6 +2393,7 @@ static void vpn_leak_to_vrf_update_onevrf(struct bgp *to_bgp, /* to */
|
|||
if (ifp)
|
||||
static_attr.nh_ifindex = ifp->ifindex;
|
||||
}
|
||||
#endif
|
||||
|
||||
switch (nhfamily) {
|
||||
case AF_INET:
|
||||
|
|
|
@ -2012,6 +2012,10 @@ if test "$enable_bgp_vnc" != "no";then
|
|||
AC_DEFINE([ENABLE_BGP_VNC], [1], [Enable BGP VNC support])
|
||||
fi
|
||||
|
||||
if test "$enable_vrf_nexthop_support" != "no";then
|
||||
AC_DEFINE([ENABLE_VRF_IFACE_NEXTHOP ], [1], [Enable BGP VRF nexthop support])
|
||||
fi
|
||||
|
||||
bgpd_bmp=false
|
||||
case "${enable_bgp_bmp}" in
|
||||
no)
|
||||
|
@ -2785,6 +2789,7 @@ dnl various features
|
|||
AM_CONDITIONAL([SUPPORT_REALMS], [test "$enable_realms" = "yes"])
|
||||
AM_CONDITIONAL([ENABLE_BGP_VNC], [test "$enable_bgp_vnc" != "no"])
|
||||
AM_CONDITIONAL([BGP_BMP], [$bgpd_bmp])
|
||||
AM_CONDITIONAL([ENABLE_VRF_IFACE_NEXTHOP], [test "$enable_vrf_nexthop_support"" != "no"])
|
||||
dnl northbound
|
||||
AM_CONDITIONAL([SQLITE3], [$SQLITE3])
|
||||
AM_CONDITIONAL([SYSREPO], [test "$enable_sysrepo" = "yes"])
|
||||
|
|
Loading…
Reference in a new issue