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

Merge pull request #6344 from dslicenc/ospf6-routemap-delete

Browse Source 
ospf6d: withdraw redistributed prefixes based on prefix-list changes
This commit is contained in:
Russ White 2020-05-18 18:52:46 -04:00 committed by GitHub
commit b575f58bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ospf6d/ospf6_asbr.c
View File

@ -47,6 +47,9 @@
#include "ospf6_flood.h" #include "ospf6_flood.h"
#include "ospf6d.h" #include "ospf6d.h"
static void ospf6_asbr_redistribute_set(int type);
static void ospf6_asbr_redistribute_unset(int type);
unsigned char conf_debug_ospf6_asbr = 0; unsigned char conf_debug_ospf6_asbr = 0;
#define ZROUTE_NAME(x) zebra_route_string(x) #define ZROUTE_NAME(x) zebra_route_string(x)
@ -935,8 +938,9 @@ static void ospf6_asbr_routemap_update(const char *mapname)
ospf6->rmap[type].map = route_map_lookup_by_name( ospf6->rmap[type].map = route_map_lookup_by_name(
ospf6->rmap[type].name); ospf6->rmap[type].name);
if (mapname && ospf6->rmap[type].map if (mapname
&& (strcmp(ospf6->rmap[type].name, mapname) == 0)) { && (strcmp(ospf6->rmap[type].name, mapname) == 0)) {
if (ospf6->rmap[type].map) {
if (IS_OSPF6_DEBUG_ASBR) if (IS_OSPF6_DEBUG_ASBR)
zlog_debug( zlog_debug(
"%s: route-map %s update, reset redist %s", "%s: route-map %s update, reset redist %s",
@ -947,6 +951,22 @@ static void ospf6_asbr_routemap_update(const char *mapname)
ospf6->rmap[type].map); ospf6->rmap[type].map);
ospf6_asbr_distribute_list_update(type); ospf6_asbr_distribute_list_update(type);
} else {
/*
* if the mapname matches a route-map on
* ospf6 but the map doesn't exist, it
* is being deleted. flush and then
* readvertise
*/
if (IS_OSPF6_DEBUG_ASBR)
zlog_debug(
"%s: route-map %s deleted, reset redist %s",
__func__, mapname,
ZROUTE_NAME(type));
ospf6_asbr_redistribute_unset(type);
ospf6_asbr_routemap_set(type, mapname);
ospf6_asbr_redistribute_set(type);
}
} }
} else } else
ospf6->rmap[type].map = NULL; ospf6->rmap[type].map = NULL;
@ -1061,6 +1081,7 @@ void ospf6_asbr_redistribute_add(int type, ifindex_t ifindex,
if (IS_OSPF6_DEBUG_ASBR) if (IS_OSPF6_DEBUG_ASBR)
zlog_debug("Denied by route-map \"%s\"", zlog_debug("Denied by route-map \"%s\"",
ospf6->rmap[type].name); ospf6->rmap[type].name);
ospf6_asbr_redistribute_remove(type, ifindex, prefix);
return; return;
} }
} }