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

lib, zebra: add ip_proto to the filter data structure

Browse Source 
Add ip_proto to the filter data structure and also account
for it in the hash when stored.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-06-04 14:18:56 -04:00
parent 8ccbc778cf
commit b94683f0db
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pbr.h
View File

@ -68,6 +68,9 @@ struct pbr_filter {
/* Filter with fwmark */ /* Filter with fwmark */
uint32_t fwmark; uint32_t fwmark;
/* Filter with the ip protocol */
uint8_t ip_proto;
}; };
/* /*

9
zebra/zebra_pbr.c
View File

@ -166,10 +166,8 @@ uint32_t zebra_pbr_rules_hash_key(const void *arg)
rule->rule.action.table, rule->rule.action.table,
prefix_hash_key(&rule->rule.filter.src_ip)); prefix_hash_key(&rule->rule.filter.src_ip));
if (rule->rule.filter.fwmark) key = jhash_3words(rule->rule.filter.fwmark, rule->vrf_id,
key = jhash_2words(rule->rule.filter.fwmark, rule->vrf_id, key); rule->rule.filter.ip_proto, key);
else
key = jhash_1word(rule->vrf_id, key);
key = jhash(rule->ifname, strlen(rule->ifname), key); key = jhash(rule->ifname, strlen(rule->ifname), key);
@ -207,6 +205,9 @@ bool zebra_pbr_rules_hash_equal(const void *arg1, const void *arg2)
if (r1->rule.filter.fwmark != r2->rule.filter.fwmark) if (r1->rule.filter.fwmark != r2->rule.filter.fwmark)
return false; return false;
if (r1->rule.filter.ip_proto != r2->rule.filter.ip_proto)
return false;
if (!prefix_same(&r1->rule.filter.src_ip, &r2->rule.filter.src_ip)) if (!prefix_same(&r1->rule.filter.src_ip, &r2->rule.filter.src_ip))
return false; return false;