]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: Set LLGR stale routes for all the paths including addpath
authorDonatas Abraitis <donatas@opensourcerouting.org>
Thu, 7 Nov 2024 11:08:35 +0000 (13:08 +0200)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Thu, 7 Nov 2024 16:07:12 +0000 (16:07 +0000)
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>
(cherry picked from commit 895d586a5f4a15be0475296d7a5a374927d17dad)

bgpd/bgp_fsm.c

index cdd9b7ae4d51aff34b9398eff6394f8aa83aa4a5..94fca23e1849aedfde1ef961c5ffcc489eb6bdbf 100644 (file)
@@ -688,6 +688,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",
@@ -698,7 +703,6 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
                                        pi->attr = bgp_attr_intern(&attr);
                                        bgp_process(peer->bgp, rm, pi, afi,
                                                    safi);
-                                       break;
                                }
                }
        } else {
@@ -715,6 +719,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",
@@ -724,7 +733,6 @@ static void bgp_set_llgr_stale(struct peer *peer, afi_t afi, safi_t safi)
                                bgp_attr_add_llgr_community(&attr);
                                pi->attr = bgp_attr_intern(&attr);
                                bgp_process(peer->bgp, dest, pi, afi, safi);
-                               break;
                        }
        }
 }