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/immediate.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/immediate.c')
-rw-r--r-- | src/expr/immediate.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index d5a7e86..47106ae 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -226,36 +226,11 @@ static void nftnl_expr_immediate_free(const struct nftnl_expr *e) nftnl_free_verdict(&imm->data); } -static bool nftnl_expr_immediate_cmp(const struct nftnl_expr *e1, - const struct nftnl_expr *e2) -{ - struct nftnl_expr_immediate *i1 = nftnl_expr_data(e1); - struct nftnl_expr_immediate *i2 = nftnl_expr_data(e2); - bool eq = true; - int type = DATA_NONE; - - if (e1->flags & (1 << NFTNL_EXPR_IMM_DREG)) - eq &= (i1->dreg == i2->dreg); - if (e1->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) - if (e1->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) - type = DATA_CHAIN; - else - type = DATA_VERDICT; - else if (e1->flags & (1 << NFTNL_EXPR_IMM_DATA)) - type = DATA_VALUE; - - if (type != DATA_NONE) - eq &= nftnl_data_reg_cmp(&i1->data, &i2->data, type); - - return eq; -} - struct expr_ops expr_ops_immediate = { .name = "immediate", .alloc_len = sizeof(struct nftnl_expr_immediate), .max_attr = NFTA_IMMEDIATE_MAX, .free = nftnl_expr_immediate_free, - .cmp = nftnl_expr_immediate_cmp, .set = nftnl_expr_immediate_set, .get = nftnl_expr_immediate_get, .parse = nftnl_expr_immediate_parse, |