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

Merge pull request #8206 from aldobrrrr/add_isis_redist_routemap_match_tag

Browse Source 
isisd: added support for routemap match tag in redistribution
This commit is contained in:
Donald Sharp 2021-03-07 08:49:22 -05:00 committed by GitHub
commit 04d91ea0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/isis_redist.c
View File

@ -219,7 +219,7 @@ static void isis_redist_ensure_default(struct isis *isis, int family)
/* Handle notification about route being added */
void isis_redist_add(struct isis *isis, int type, struct prefix *p,
struct prefix_ipv6 *src_p, uint8_t distance,
uint32_t metric)
uint32_t metric, const route_tag_t tag)
{
int family = p->family;
struct route_table *ei_table = get_ext_info(isis, family);
@ -250,6 +250,7 @@ void isis_redist_add(struct isis *isis, int type, struct prefix *p,
info->origin = type;
info->distance = distance;
info->metric = metric;
info->tag = tag;
if (is_default_prefix(p)
&& (!src_p || !src_p->prefixlen)) {
@ -288,7 +289,7 @@ void isis_redist_delete(struct isis *isis, int type, struct prefix *p,
* "always" setting will ignore routes with origin
* DEFAULT_ROUTE. */
isis_redist_add(isis, DEFAULT_ROUTE, p, NULL, 254,
MAX_WIDE_PATH_METRIC);
MAX_WIDE_PATH_METRIC, 0);
return;
}

3
isisd/isis_redist.h
View File

@ -31,6 +31,7 @@ struct isis_ext_info {
int origin;
uint32_t metric;
uint8_t distance;
route_tag_t tag;
};
struct isis_redist {
@ -50,7 +51,7 @@ struct route_table *get_ext_reach(struct isis_area *area, int family,
int level);
void isis_redist_add(struct isis *isis, int type, struct prefix *p,
struct prefix_ipv6 *src_p, uint8_t distance,
uint32_t metric);
uint32_t metric, route_tag_t tag);
void isis_redist_delete(struct isis *isis, int type, struct prefix *p,
struct prefix_ipv6 *src_p);
int isis_redist_config_write(struct vty *vty, struct isis_area *area,

33
isisd/isis_routemap.c
View File

@ -112,6 +112,35 @@ static const struct route_map_rule_cmd
/* ------------------------------------------------------------*/
/* `match tag TAG' */
/* Match function return 1 if match is success else return zero. */
static enum route_map_cmd_result_t
route_match_tag(void *rule, const struct prefix *p, void *object)
{
route_tag_t *tag;
struct isis_ext_info *info;
route_tag_t info_tag;
tag = rule;
info = object;
info_tag = info->tag;
if (info_tag == *tag)
return RMAP_MATCH;
else
return RMAP_NOMATCH;
}
/* Route map commands for tag matching. */
static const struct route_map_rule_cmd route_match_tag_cmd = {
"tag",
route_match_tag,
route_map_rule_tag_compile,
route_map_rule_tag_free,
};
/* ------------------------------------------------------------*/
static enum route_map_cmd_result_t
route_match_ipv6_address(void *rule, const struct prefix *prefix, void *object)
{
@ -234,6 +263,9 @@ void isis_route_map_init(void)
route_map_match_ipv6_address_prefix_list_hook(generic_match_add);
route_map_no_match_ipv6_address_prefix_list_hook(generic_match_delete);
route_map_match_tag_hook(generic_match_add);
route_map_no_match_tag_hook(generic_match_delete);
route_map_set_metric_hook(generic_set_add);
route_map_no_set_metric_hook(generic_set_delete);
@ -241,5 +273,6 @@ void isis_route_map_init(void)
route_map_install_match(&route_match_ip_address_prefix_list_cmd);
route_map_install_match(&route_match_ipv6_address_cmd);
route_map_install_match(&route_match_ipv6_address_prefix_list_cmd);
route_map_install_match(&route_match_tag_cmd);
route_map_install_set(&route_set_metric_cmd);
}

2
isisd/isis_zebra.c
View File

@ -509,7 +509,7 @@ static int isis_zebra_read(ZAPI_CALLBACK_ARGS)
if (cmd == ZEBRA_REDISTRIBUTE_ROUTE_ADD)
isis_redist_add(isis, api.type, &api.prefix, &api.src_prefix,
api.distance, api.metric);
api.distance, api.metric, api.tag);
else
isis_redist_delete(isis, api.type, &api.prefix,
&api.src_prefix);