From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 27 Feb 2025 18:50:31 +0000 (+0200)
Subject: bgpd: Do not remove the path from Adj-Rib-Out if it's a selected route
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eecfea97689c537a0e261f5ac47409847d9a51b7;p=mirror%2Ffrr.git

bgpd: Do not remove the path from Adj-Rib-Out if it's a selected route

There was a case where removing the selected (single best) route leads to
adj-rib-out to be vanished at all.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index f821a1453a..29e52bde24 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -216,6 +216,7 @@ static int group_announce_route_walkcb(struct update_group *updgrp, void *arg)
 	safi_t safi;
 	struct peer *peer;
 	struct bgp_adj_out *adj, *adj_next;
+	struct bgp_path_info *bpi;
 	bool addpath_capable;
 
 	afi = UPDGRP_AFI(updgrp);
@@ -281,10 +282,23 @@ static int group_announce_route_walkcb(struct update_group *updgrp, void *arg)
 				 */
 				RB_FOREACH_SAFE (adj, bgp_adj_out_rb, &ctx->dest->adj_out,
 						 adj_next) {
+					uint32_t best_tx_id = 0;
+
 					if (adj->subgroup != subgrp)
 						continue;
 
-					if (!adj->adv)
+					for (bpi = bgp_dest_get_bgp_path_info(ctx->dest); bpi;
+					     bpi = bpi->next) {
+						if (bgp_addpath_id_for_peer(peer, afi, safi,
+									    &bpi->tx_addpath) ==
+							    adj->addpath_tx_id &&
+						    CHECK_FLAG(bpi->flags, BGP_PATH_SELECTED)) {
+							best_tx_id = adj->addpath_tx_id;
+							break;
+						}
+					}
+
+					if (adj->addpath_tx_id != best_tx_id)
 						subgroup_process_announce_selected(subgrp, NULL,
 										   ctx->dest, afi,
 										   safi,