diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 19:18:50 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-10-24 19:26:34 +0200 |
commit | 6dc1c3d8bb64077da7f3f28c7368fb087d10a492 (patch) | |
tree | 880fe8bacaaf4b72035a9c430f86e6e5a15ba9bf /src/expr/lookup.c | |
parent | dc240913458d591f59b52b3899d3fc3c5d6ec6ce (diff) |
src: remove nftnl_rule_cmp() and nftnl_expr_cmp()
These functions are not very useful, rule comparison from this layer
does not work well with implicit set definitions.
This infrastructure was added as an attempt to support for deletion by
name from this layer, which should be done from higher level libnftables
library. Finally, we never had a client for this code in
git.netfilter.org.
Let's remove it and bump libversion for safety reasons.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/lookup.c')
-rw-r--r-- | src/expr/lookup.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/expr/lookup.c b/src/expr/lookup.c index a502e2a..a495ac0 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -212,33 +212,11 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e) xfree(lookup->set_name); } -static bool nftnl_expr_lookup_cmp(const struct nftnl_expr *e1, - const struct nftnl_expr *e2) -{ - struct nftnl_expr_lookup *l1 = nftnl_expr_data(e1); - struct nftnl_expr_lookup *l2 = nftnl_expr_data(e2); - bool eq = true; - - if (e1->flags & (1 << NFTNL_EXPR_LOOKUP_SREG)) - eq &= (l1->sreg == l2->sreg); - if (e1->flags & (1 << NFTNL_EXPR_LOOKUP_DREG)) - eq &= (l1->dreg == l2->dreg); - if (e1->flags & (1 << NFTNL_EXPR_LOOKUP_SET)) - eq &= !strcmp(l1->set_name, l2->set_name); - if (e1->flags & (1 << NFTNL_EXPR_LOOKUP_SET_ID)) - eq &= (l1->set_id == l2->set_id); - if (e1->flags & (1 << NFTNL_EXPR_LOOKUP_FLAGS)) - eq &= (l1->flags == l2->flags); - - return eq; -} - struct expr_ops expr_ops_lookup = { .name = "lookup", .alloc_len = sizeof(struct nftnl_expr_lookup), .max_attr = NFTA_LOOKUP_MAX, .free = nftnl_expr_lookup_free, - .cmp = nftnl_expr_lookup_cmp, .set = nftnl_expr_lookup_set, .get = nftnl_expr_lookup_get, .parse = nftnl_expr_lookup_parse, |