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

bgpd: Improve route-map matching for INET(6) AF

Browse Source 
While the current implementation does pay attention to the AF
(inet/inet6) when comparing the IPv4/v6 address against an address-list
/ prefix-list inside a route-map, the AF check is being done rather
late, which leads to CPU cycles being wasted due to unnecessary list
lookups / address matching.

This commit checks the address family of a prefix right inside the
`route_match_ip(v6)_` functions before looking up any address- and/or
prefix-list, which should improve performance.

Signed-off-by: Pascal Mathis <mail@pascalmathis.com>
This commit is contained in:
Pascal Mathis 2018-05-15 19:22:25 +02:00
parent 05c6f6a3c2
commit 09cd98ebee
No known key found for this signature in database
GPG Key ID: E208DBA7BFC9B28C
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bgpd/bgp_routemap.c
View File

@ -338,9 +338,8 @@ static route_map_result_t route_match_ip_address(void *rule,
void *object)
{
struct access_list *alist;
/* struct prefix_ipv4 match; */
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
alist = access_list_lookup(AFI_IP, (char *)rule);
if (alist == NULL)
return RMAP_NOMATCH;
@ -382,7 +381,7 @@ static route_map_result_t route_match_ip_next_hop(void *rule,
struct bgp_info *bgp_info;
struct prefix_ipv4 p;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
bgp_info = object;
p.family = AF_INET;
p.prefix = bgp_info->attr->nexthop;
@ -430,7 +429,7 @@ static route_map_result_t route_match_ip_route_source(void *rule,
struct peer *peer;
struct prefix_ipv4 p;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
bgp_info = object;
peer = bgp_info->peer;
@ -478,7 +477,7 @@ route_match_ip_address_prefix_list(void *rule, struct prefix *prefix,
{
struct prefix_list *plist;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
plist = prefix_list_lookup(AFI_IP, (char *)rule);
if (plist == NULL)
return RMAP_NOMATCH;
@ -515,7 +514,7 @@ route_match_ip_next_hop_prefix_list(void *rule, struct prefix *prefix,
struct bgp_info *bgp_info;
struct prefix_ipv4 p;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
bgp_info = object;
p.family = AF_INET;
p.prefix = bgp_info->attr->nexthop;
@ -558,7 +557,7 @@ route_match_ip_route_source_prefix_list(void *rule, struct prefix *prefix,
struct peer *peer;
struct prefix_ipv4 p;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET) {
bgp_info = object;
peer = bgp_info->peer;
@ -2239,7 +2238,7 @@ static route_map_result_t route_match_ipv6_address(void *rule,
{
struct access_list *alist;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET6) {
alist = access_list_lookup(AFI_IP6, (char *)rule);
if (alist == NULL)
return RMAP_NOMATCH;
@ -2326,7 +2325,7 @@ route_match_ipv6_address_prefix_list(void *rule, struct prefix *prefix,
{
struct prefix_list *plist;
if (type == RMAP_BGP) {
if (type == RMAP_BGP && prefix->family == AF_INET6) {
plist = prefix_list_lookup(AFI_IP6, (char *)rule);
if (plist == NULL)
return RMAP_NOMATCH;