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

Merge pull request #4585 from ton31337/fix/no_match_ip_next_hop_blackhole

Browse Source 
rmap: Add hooks into zebra,ospf,rip for `match ip next-hop type blackhole`
This commit is contained in:
Donald Sharp 2019-06-21 18:41:40 -04:00 committed by GitHub
commit a9617f89c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 152 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ospfd/ospf_routemap.c
View File

@ -210,6 +210,40 @@ struct route_map_rule_cmd route_match_ip_next_hop_prefix_list_cmd = {
route_match_ip_next_hop_prefix_list_compile, route_match_ip_next_hop_prefix_list_compile,
route_match_ip_next_hop_prefix_list_free}; route_match_ip_next_hop_prefix_list_free};
/* `match ip next-hop type <blackhole>' */
static route_map_result_t
route_match_ip_next_hop_type(void *rule, const struct prefix *prefix,
route_map_object_t type, void *object)
{
struct external_info *ei = object;
if (type == RMAP_OSPF && prefix->family == AF_INET) {
ei = (struct external_info *)object;
if (!ei)
return RMAP_DENYMATCH;
if (ei->nexthop.s_addr == INADDR_ANY && !ei->ifindex)
return RMAP_MATCH;
}
return RMAP_NOMATCH;
}
static void *route_match_ip_next_hop_type_compile(const char *arg)
{
return XSTRDUP(MTYPE_ROUTE_MAP_COMPILED, arg);
}
static void route_match_ip_next_hop_type_free(void *rule)
{
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
static struct route_map_rule_cmd route_match_ip_next_hop_type_cmd = {
"ip next-hop type", route_match_ip_next_hop_type,
route_match_ip_next_hop_type_compile,
route_match_ip_next_hop_type_free};
/* `match ip address IP_ACCESS_LIST' */ /* `match ip address IP_ACCESS_LIST' */
/* Match function should return 1 if match is success else return /* Match function should return 1 if match is success else return
zero. */ zero. */
@ -566,6 +600,9 @@ void ospf_route_map_init(void)
route_map_match_ip_next_hop_prefix_list_hook(generic_match_add); route_map_match_ip_next_hop_prefix_list_hook(generic_match_add);
route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete); route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete);
route_map_match_ip_next_hop_type_hook(generic_match_add);
route_map_no_match_ip_next_hop_type_hook(generic_match_delete);
route_map_match_tag_hook(generic_match_add); route_map_match_tag_hook(generic_match_add);
route_map_no_match_tag_hook(generic_match_delete); route_map_no_match_tag_hook(generic_match_delete);
@ -579,6 +616,7 @@ void ospf_route_map_init(void)
route_map_install_match(&route_match_ip_next_hop_prefix_list_cmd); route_map_install_match(&route_match_ip_next_hop_prefix_list_cmd);
route_map_install_match(&route_match_ip_address_cmd); route_map_install_match(&route_match_ip_address_cmd);
route_map_install_match(&route_match_ip_address_prefix_list_cmd); route_map_install_match(&route_match_ip_address_prefix_list_cmd);
route_map_install_match(&route_match_ip_next_hop_type_cmd);
route_map_install_match(&route_match_interface_cmd); route_map_install_match(&route_match_interface_cmd);
route_map_install_match(&route_match_tag_cmd); route_map_install_match(&route_match_tag_cmd);

38
ripd/rip_routemap.c
View File

@ -231,6 +231,40 @@ static struct route_map_rule_cmd route_match_ip_next_hop_prefix_list_cmd = {
route_match_ip_next_hop_prefix_list_compile, route_match_ip_next_hop_prefix_list_compile,
route_match_ip_next_hop_prefix_list_free}; route_match_ip_next_hop_prefix_list_free};
/* `match ip next-hop type <blackhole>' */
static route_map_result_t
route_match_ip_next_hop_type(void *rule, const struct prefix *prefix,
route_map_object_t type, void *object)
{
struct rip_info *rinfo;
if (type == RMAP_RIP && prefix->family == AF_INET) {
rinfo = (struct rip_info *)object;
if (!rinfo)
return RMAP_DENYMATCH;
if (rinfo->nh.type == NEXTHOP_TYPE_BLACKHOLE)
return RMAP_MATCH;
}
return RMAP_NOMATCH;
}
static void *route_match_ip_next_hop_type_compile(const char *arg)
{
return XSTRDUP(MTYPE_ROUTE_MAP_COMPILED, arg);
}
static void route_match_ip_next_hop_type_free(void *rule)
{
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
static struct route_map_rule_cmd route_match_ip_next_hop_type_cmd = {
"ip next-hop type", route_match_ip_next_hop_type,
route_match_ip_next_hop_type_compile,
route_match_ip_next_hop_type_free};
/* `match ip address IP_ACCESS_LIST' */ /* `match ip address IP_ACCESS_LIST' */
/* Match function should return 1 if match is success else return /* Match function should return 1 if match is success else return
@ -537,6 +571,9 @@ void rip_route_map_init(void)
route_map_match_ip_next_hop_prefix_list_hook(generic_match_add); route_map_match_ip_next_hop_prefix_list_hook(generic_match_add);
route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete); route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete);
route_map_match_ip_next_hop_type_hook(generic_match_add);
route_map_no_match_ip_next_hop_type_hook(generic_match_delete);
route_map_match_metric_hook(generic_match_add); route_map_match_metric_hook(generic_match_add);
route_map_no_match_metric_hook(generic_match_delete); route_map_no_match_metric_hook(generic_match_delete);
@ -556,6 +593,7 @@ void rip_route_map_init(void)
route_map_install_match(&route_match_interface_cmd); route_map_install_match(&route_match_interface_cmd);
route_map_install_match(&route_match_ip_next_hop_cmd); route_map_install_match(&route_match_ip_next_hop_cmd);
route_map_install_match(&route_match_ip_next_hop_prefix_list_cmd); route_map_install_match(&route_match_ip_next_hop_prefix_list_cmd);
route_map_install_match(&route_match_ip_next_hop_type_cmd);
route_map_install_match(&route_match_ip_address_cmd); route_map_install_match(&route_match_ip_address_cmd);
route_map_install_match(&route_match_ip_address_prefix_list_cmd); route_map_install_match(&route_match_ip_address_prefix_list_cmd);
route_map_install_match(&route_match_tag_cmd); route_map_install_match(&route_match_tag_cmd);

76
zebra/zebra_routemap.c
View File

@ -1254,6 +1254,40 @@ static struct route_map_rule_cmd route_match_ipv6_address_prefix_list_cmd = {
route_match_address_prefix_list_compile, route_match_address_prefix_list_compile,
route_match_address_prefix_list_free}; route_match_address_prefix_list_free};
/* `match ipv6 next-hop type <TYPE>' */
static route_map_result_t
route_match_ipv6_next_hop_type(void *rule, const struct prefix *prefix,
route_map_object_t type, void *object)
{
struct nh_rmap_obj *nh_data;
if (type == RMAP_ZEBRA && prefix->family == AF_INET6) {
nh_data = (struct nh_rmap_obj *)object;
if (!nh_data)
return RMAP_DENYMATCH;
if (nh_data->nexthop->type == NEXTHOP_TYPE_BLACKHOLE)
return RMAP_MATCH;
}
return RMAP_NOMATCH;
}
static void *route_match_ipv6_next_hop_type_compile(const char *arg)
{
return XSTRDUP(MTYPE_ROUTE_MAP_COMPILED, arg);
}
static void route_match_ipv6_next_hop_type_free(void *rule)
{
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
struct route_map_rule_cmd route_match_ipv6_next_hop_type_cmd = {
"ipv6 next-hop type", route_match_ipv6_next_hop_type,
route_match_ipv6_next_hop_type_compile,
route_match_ipv6_next_hop_type_free};
/* `match ip address prefix-len PREFIXLEN' */ /* `match ip address prefix-len PREFIXLEN' */
static route_map_result_t static route_map_result_t
@ -1345,6 +1379,40 @@ static struct route_map_rule_cmd route_match_ip_nexthop_prefix_len_cmd = {
route_match_address_prefix_len_free /* reuse */ route_match_address_prefix_len_free /* reuse */
}; };
/* `match ip next-hop type <blackhole>' */
static route_map_result_t
route_match_ip_next_hop_type(void *rule, const struct prefix *prefix,
route_map_object_t type, void *object)
{
struct nh_rmap_obj *nh_data;
if (type == RMAP_ZEBRA && prefix->family == AF_INET) {
nh_data = (struct nh_rmap_obj *)object;
if (!nh_data)
return RMAP_DENYMATCH;
if (nh_data->nexthop->type == NEXTHOP_TYPE_BLACKHOLE)
return RMAP_MATCH;
}
return RMAP_NOMATCH;
}
static void *route_match_ip_next_hop_type_compile(const char *arg)
{
return XSTRDUP(MTYPE_ROUTE_MAP_COMPILED, arg);
}
static void route_match_ip_next_hop_type_free(void *rule)
{
XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
}
static struct route_map_rule_cmd route_match_ip_next_hop_type_cmd = {
"ip next-hop type", route_match_ip_next_hop_type,
route_match_ip_next_hop_type_compile,
route_match_ip_next_hop_type_free};
/* `match source-protocol PROTOCOL' */ /* `match source-protocol PROTOCOL' */
static route_map_result_t route_match_source_protocol(void *rule, static route_map_result_t route_match_source_protocol(void *rule,
@ -1927,6 +1995,9 @@ void zebra_route_map_init(void)
route_map_match_ip_next_hop_prefix_list_hook(generic_match_add); route_map_match_ip_next_hop_prefix_list_hook(generic_match_add);
route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete); route_map_no_match_ip_next_hop_prefix_list_hook(generic_match_delete);
route_map_match_ip_next_hop_type_hook(generic_match_add);
route_map_no_match_ip_next_hop_type_hook(generic_match_delete);
route_map_match_tag_hook(generic_match_add); route_map_match_tag_hook(generic_match_add);
route_map_no_match_tag_hook(generic_match_delete); route_map_no_match_tag_hook(generic_match_delete);
@ -1936,6 +2007,9 @@ void zebra_route_map_init(void)
route_map_match_ipv6_address_prefix_list_hook(generic_match_add); 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_no_match_ipv6_address_prefix_list_hook(generic_match_delete);
route_map_match_ipv6_next_hop_type_hook(generic_match_add);
route_map_no_match_ipv6_next_hop_type_hook(generic_match_delete);
route_map_install_match(&route_match_tag_cmd); route_map_install_match(&route_match_tag_cmd);
route_map_install_match(&route_match_interface_cmd); route_map_install_match(&route_match_interface_cmd);
route_map_install_match(&route_match_ip_next_hop_cmd); route_map_install_match(&route_match_ip_next_hop_cmd);
@ -1947,6 +2021,8 @@ void zebra_route_map_init(void)
route_map_install_match(&route_match_ip_address_prefix_len_cmd); route_map_install_match(&route_match_ip_address_prefix_len_cmd);
route_map_install_match(&route_match_ipv6_address_prefix_len_cmd); route_map_install_match(&route_match_ipv6_address_prefix_len_cmd);
route_map_install_match(&route_match_ip_nexthop_prefix_len_cmd); route_map_install_match(&route_match_ip_nexthop_prefix_len_cmd);
route_map_install_match(&route_match_ip_next_hop_type_cmd);
route_map_install_match(&route_match_ipv6_next_hop_type_cmd);
route_map_install_match(&route_match_source_protocol_cmd); route_map_install_match(&route_match_source_protocol_cmd);
route_map_install_match(&route_match_source_instance_cmd); route_map_install_match(&route_match_source_instance_cmd);