From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 7 Nov 2024 11:08:35 +0000 (+0200)
Subject: bgpd: Set LLGR stale routes for all the paths including addpath
X-Git-Tag: docker/9.1.3~10^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=875337f58673ad15bd4caaf4ce2ccc393c3f5b25;p=matthieu%2Ffrr.git

bgpd: Set LLGR stale routes for all the paths including addpath

Without this patch we set only the first path for the route (if multiple exist)
as LLGR stale and stop doing that for the rest of the paths, which is wrong.

Fixes: 1479ed2fb35f4a5ae1017201a7ee37ba2727163a ("bgpd: Implement LLGR helper mode")

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

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 4f519dc197..69cc78e0f8 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -685,6 +685,11 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
 						    COMMUNITY_NO_LLGR))
 						continue;
 
+					if (bgp_attr_get_community(pi->attr) &&
+					    community_include(bgp_attr_get_community(pi->attr),
+							      COMMUNITY_LLGR_STALE))
+						continue;
+
 					if (bgp_debug_neighbor_events(peer))
 						zlog_debug(
 							"%pBP Long-lived set stale community (LLGR_STALE) for: %pFX",
@@ -695,8 +700,6 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
 					pi->attr = bgp_attr_intern(&attr);
 					bgp_recalculate_afi_safi_bestpaths(
 						peer->bgp, afi, safi);
-
-					break;
 				}
 		}
 	} else {
@@ -713,6 +716,11 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
 					    COMMUNITY_NO_LLGR))
 					continue;
 
+				if (bgp_attr_get_community(pi->attr) &&
+				    community_include(bgp_attr_get_community(pi->attr),
+						      COMMUNITY_LLGR_STALE))
+					continue;
+
 				if (bgp_debug_neighbor_events(peer))
 					zlog_debug(
 						"%pBP Long-lived set stale community (LLGR_STALE) for: %pFX",
@@ -723,8 +731,6 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
 				pi->attr = bgp_attr_intern(&attr);
 				bgp_recalculate_afi_safi_bestpaths(peer->bgp,
 								   afi, safi);
-
-				break;
 			}
 	}
 }