bgpd: fix using bgp lu remote label when sending to ibgp peer

When redistributing an advertisement from an EBGP peer to an IBGP peer, and the next-hop is kept unchanged, then the remote label should be used. Fix this by checking the 'NEXTHOP_SELF' flag in the ibgp peer. Fixes: cd1964f ("bgpd: labeled unicast processing") Signed-off-by: Philippe Guibert <[email protected]>
pguibert6WIND · Aug 29, 2023 · 42f9682 · 42f9682
1 parent dccd9ab
commit 42f9682
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/bgpd/bgp_label.c b/bgpd/bgp_label.c
@@ -94,9 +94,10 @@ mpls_label_t bgp_adv_label(struct bgp_dest *dest, struct bgp_path_info *pi,
 	reflect =
 		((from->sort == BGP_PEER_IBGP) && (to->sort == BGP_PEER_IBGP));
 
-	if (reflect
-	    && !CHECK_FLAG(to->af_flags[afi][safi],
-			   PEER_FLAG_FORCE_NEXTHOP_SELF))
+	if (reflect &&
+	    !CHECK_FLAG(to->af_flags[afi][safi],
+			PEER_FLAG_FORCE_NEXTHOP_SELF) &&
+	    !CHECK_FLAG(to->af_flags[afi][safi], PEER_FLAG_NEXTHOP_SELF))
 		return remote_label;
 
 	if (CHECK_FLAG(to->af_flags[afi][safi], PEER_FLAG_NEXTHOP_UNCHANGED))