From 38ad215feb313775e066c807a9a2bdf672d3c067 Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Tue, 8 Oct 2024 13:01:45 +0200 Subject: [PATCH] Revert "bgpd: Exclude case for remote prefix w/o link-local" This reverts commit 5f6a61f91fdbfa33df1b7112c961135156fbd894. Signed-off-by: Louis Scalbert --- bgpd/bgp_route.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 475b709a07..18f1e5fd04 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2467,16 +2467,13 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi, if (NEXTHOP_IS_V6) { attr->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL; if ((CHECK_FLAG(peer->af_flags[afi][safi], - PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED) && - IN6_IS_ADDR_LINKLOCAL(&attr->mp_nexthop_local)) || - (!reflect && !transparent && - IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_local) && - peer->shared_network && - ((from == bgp->peer_self && peer->sort == BGP_PEER_EBGP) || - (from == bgp->peer_self && peer->sort != BGP_PEER_EBGP) || - (from != bgp->peer_self && - IN6_IS_ADDR_LINKLOCAL(&attr->mp_nexthop_local) && - peer->sort == BGP_PEER_EBGP)))) { + PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED) + && IN6_IS_ADDR_LINKLOCAL(&attr->mp_nexthop_local)) + || (!reflect && !transparent + && IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_local) + && peer->shared_network + && (from == bgp->peer_self + || peer->sort == BGP_PEER_EBGP))) { if (safi == SAFI_MPLS_VPN) attr->mp_nexthop_len = BGP_ATTR_NHLEN_VPNV6_GLOBAL_AND_LL; -- 2.39.5