From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 7 Nov 2024 11:04:54 +0000 (+0200)
Subject: bgpd: Clear all paths including addpath once GR expires
X-Git-Tag: docker/10.2.0~5^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f1454d95aa4208c0a7892c485df91790e8db748b;p=mirror%2Ffrr.git

bgpd: Clear all paths including addpath once GR expires

We iterated over all bgp_path_info's, but once we remove the path, we didn't
check for other paths under the same bgp_dest.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 7de464b00f1a188ec919abce56de6215f05fc4c0)
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index e158a8335f..302feea58c 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6279,7 +6279,6 @@ void bgp_clear_stale_route(struct peer *peer, afi_t afi, safi_t safi)
 						vpn_leak_to_vrf_withdraw(pi);
 
 					bgp_rib_remove(rm, pi, peer, afi, safi);
-					break;
 				}
 		}
 	} else {
@@ -6308,7 +6307,6 @@ void bgp_clear_stale_route(struct peer *peer, afi_t afi, safi_t safi)
 						pi);
 
 				bgp_rib_remove(dest, pi, peer, afi, safi);
-				break;
 			}
 	}
 }