proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:57:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10716 from donaldsharp/routemap_rbtree_nonuniq

Browse Source
This commit is contained in:
David Lamparter 2022-03-13 15:08:36 +01:00 committed by GitHub
commit 32addf8f7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/routemap.c
View File

@ -100,6 +100,7 @@ static void route_map_del_plist_entries(afi_t afi,
struct prefix_list_entry *entry); struct prefix_list_entry *entry);
static struct hash *route_map_get_dep_hash(route_map_event_t event); static struct hash *route_map_get_dep_hash(route_map_event_t event);
static void route_map_free_map(struct route_map *map);
struct route_map_match_set_hooks rmap_match_set_hook; struct route_map_match_set_hooks rmap_match_set_hook;
@ -566,15 +567,8 @@ static bool route_map_hash_cmp(const void *p1, const void *p2)
const struct route_map *map1 = p1; const struct route_map *map1 = p1;
const struct route_map *map2 = p2; const struct route_map *map2 = p2;
if (map1->deleted == map2->deleted) { if (!strcmp(map1->name, map2->name))
if (map1->name && map2->name) { return true;
if (!strcmp(map1->name, map2->name)) {
return true;
}
} else if (!map1->name && !map2->name) {
return true;
}
}
return false; return false;
} }
@ -636,13 +630,25 @@ static struct route_map *route_map_new(const char *name)
/* Add new name to route_map. */ /* Add new name to route_map. */
static struct route_map *route_map_add(const char *name) static struct route_map *route_map_add(const char *name)
{ {
struct route_map *map; struct route_map *map, *exist;
struct route_map_list *list; struct route_map_list *list;
map = route_map_new(name); map = route_map_new(name);
list = &route_map_master; list = &route_map_master;
/* Add map to the hash */ /*
* Add map to the hash
*
* If the map already exists in the hash, then we know that
* FRR is now in a sequence of delete/create.
* All FRR needs to do here is set the to_be_processed
* bit (to inherit from the old one
*/
exist = hash_release(route_map_master_hash, map);
if (exist) {
map->to_be_processed = exist->to_be_processed;
route_map_free_map(exist);
}
hash_get(route_map_master_hash, map, hash_alloc_intern); hash_get(route_map_master_hash, map, hash_alloc_intern);
/* Add new entry to the head of the list to match how it is added in the /* Add new entry to the head of the list to match how it is added in the
@ -752,11 +758,15 @@ struct route_map *route_map_lookup_by_name(const char *name)
if (!name) if (!name)
return NULL; return NULL;
// map.deleted is 0 via memset // map.deleted is false via memset
memset(&tmp_map, 0, sizeof(struct route_map)); memset(&tmp_map, 0, sizeof(struct route_map));
tmp_map.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name); tmp_map.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name);
map = hash_lookup(route_map_master_hash, &tmp_map); map = hash_lookup(route_map_master_hash, &tmp_map);
XFREE(MTYPE_ROUTE_MAP_NAME, tmp_map.name); XFREE(MTYPE_ROUTE_MAP_NAME, tmp_map.name);
if (map && map->deleted)
return NULL;
return map; return map;
} }