proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 07:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "bgpd: Reinstall aggregated routes if using route-maps and it was changed"

Browse Source 
This reverts commit ee1986f1b5.

The fix is incomplete, and is no longer needed with the fix that applies
the route-map for an aggregate and then compares the attribute.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
This commit is contained in:
Enke Chen 2025-01-08 09:12:56 -08:00
parent 3d7dbcf6c6
commit b0f96fc247
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_route.c
View File

@ -8008,9 +8008,8 @@ static void bgp_aggregate_install(
* If the aggregate information has not changed * If the aggregate information has not changed
* no need to re-install it again. * no need to re-install it again.
*/ */
if (pi && (!aggregate->rmap.changed && if (pi && bgp_aggregate_info_same(pi, origin, aspath, community,
bgp_aggregate_info_same(pi, origin, aspath, community, ecommunity, lcommunity)) {
ecommunity, lcommunity))) {
bgp_dest_unlock_node(dest); bgp_dest_unlock_node(dest);
if (aspath) if (aspath)
@ -9010,7 +9009,6 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
aggregate->rmap.name = aggregate->rmap.name =
XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap); XSTRDUP(MTYPE_ROUTE_MAP_NAME, rmap);
aggregate->rmap.map = route_map_lookup_by_name(rmap); aggregate->rmap.map = route_map_lookup_by_name(rmap);
aggregate->rmap.changed = true;
route_map_counter_increment(aggregate->rmap.map); route_map_counter_increment(aggregate->rmap.map);
} }

1
bgpd/bgp_route.h
View File

@ -449,7 +449,6 @@ struct bgp_aggregate {
struct { struct {
char *name; char *name;
struct route_map *map; struct route_map *map;
bool changed;
} rmap; } rmap;
/* Suppress-count. */ /* Suppress-count. */

1
bgpd/bgp_routemap.c
View File

@ -4684,7 +4684,6 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
route_map_counter_increment(map); route_map_counter_increment(map);
aggregate->rmap.map = map; aggregate->rmap.map = map;
aggregate->rmap.changed = true;
matched = true; matched = true;
} }