Revert "Merge pull request FRRouting#15259 from dmytroshytyi-6WIND/ne…

…xthop_resolution"

This reverts commit add56c6, reversing
changes made to b774fc6.

bgpd/bgp_route.c

@@ -4662,22 +4662,7 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 		if (aspath_get_last_as(attr->aspath) == bgp->as)
 			do_loop_check = 0;
 
-	/* When using bgp ipv4 labeled session, the local prefix is
-	 * received by a peer, and finds out that the proposed prefix
-	 * and its next-hop are the same. To avoid a route loop locally,
-	 * no nexthop entry is referenced for that prefix, and the route
-	 * will not be selected.
-	 *
-	 * As it has been done for ipv4-unicast, apply the following fix
-	 * for labeled address families: when the received peer is
-	 * a route reflector, the prefix has to be selected, even if the
-	 * route can not be installed locally.
-	 */
-	if (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT) ||
-	    (safi == SAFI_UNICAST && !peer->afc[afi][safi] &&
-	     peer->afc[afi][SAFI_LABELED_UNICAST] &&
-	     CHECK_FLAG(peer->af_flags[afi][SAFI_LABELED_UNICAST],
-			PEER_FLAG_REFLECTOR_CLIENT)))
+	if (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT))
 		bgp_nht_param_prefix = NULL;
 	else
 		bgp_nht_param_prefix = p;

doc/user/zebra.rst

@@ -815,16 +815,6 @@ Allocated label chunks table can be dumped using the command
    range is configured, static label requests that match that
    range are not accepted.
 
-FEC nexthop entry resolution over MPLS networks
------------------------------------------------
-
-The LSP associated with a BGP labeled route is normally restricted to
-directly-connected nexthops. If connected nexthops are not available,
-the LSP entry will not be installed. This command permits the use of
-recursive resolution for LSPs, similar to that available for IP routes.
-
-.. clicmd:: mpls fec nexthop-resolution
-
 .. _zebra-srv6:
 
 Segment-Routing IPv6

lib/nexthop.c

@@ -713,15 +713,6 @@ struct nexthop *nexthop_next(const struct nexthop *nexthop)
 	return NULL;
 }
 
-struct nexthop *nexthop_next_resolution(const struct nexthop *nexthop,
-					bool nexthop_resolution)
-{
-	if (nexthop_resolution)
-		return nexthop_next(nexthop);
-	/* no resolution attempt */
-	return nexthop->next;
-}
-
 /* Return the next nexthop in the tree that is resolved and active */
 struct nexthop *nexthop_next_active_resolved(const struct nexthop *nexthop)
 {

lib/nexthop.h

@@ -225,8 +225,6 @@ extern bool nexthop_labels_match(const struct nexthop *nh1,
 extern const char *nexthop2str(const struct nexthop *nexthop,
 			       char *str, int size);
 extern struct nexthop *nexthop_next(const struct nexthop *nexthop);
-extern struct nexthop *nexthop_next_resolution(const struct nexthop *nexthop,
-					       bool nexthop_resolution);
 extern struct nexthop *
 nexthop_next_active_resolved(const struct nexthop *nexthop);
 extern unsigned int nexthop_level(const struct nexthop *nexthop);