From 6dc1c3d8bb64077da7f3f28c7368fb087d10a492 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 24 Oct 2018 19:18:50 +0200 Subject: 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 --- src/expr/hash.c | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'src/expr/hash.c') diff --git a/src/expr/hash.c b/src/expr/hash.c index 46b7901..f553a3c 100644 --- a/src/expr/hash.c +++ b/src/expr/hash.c @@ -276,40 +276,10 @@ nftnl_expr_hash_snprintf(char *buf, size_t len, uint32_t type, return -1; } -static bool nftnl_expr_hash_cmp(const struct nftnl_expr *e1, - const struct nftnl_expr *e2) -{ - struct nftnl_expr_hash *h1 = nftnl_expr_data(e1); - struct nftnl_expr_hash *h2 = nftnl_expr_data(e2); - bool eq = true; - - if (e1->flags & (1 << NFTNL_EXPR_HASH_SREG)) - eq &= (h1->sreg == h2->sreg); - if (e1->flags & (1 << NFTNL_EXPR_HASH_DREG)) - eq &= (h1->dreg == h2->dreg); - if (e1->flags & (1 << NFTNL_EXPR_HASH_LEN)) - eq &= (h1->len == h2->len); - if (e1->flags & (1 << NFTNL_EXPR_HASH_MODULUS)) - eq &= (h1->modulus == h2->modulus); - if (e1->flags & (1 << NFTNL_EXPR_HASH_SEED)) - eq &= (h1->seed == h2->seed); - if (e1->flags & (1 << NFTNL_EXPR_HASH_OFFSET)) - eq &= (h1->offset == h2->offset); - if (e1->flags & (1 << NFTNL_EXPR_HASH_TYPE)) - eq &= (h1->type == h2->type); - if (e1->flags & (1 << NFTNL_EXPR_HASH_SET_NAME)) - eq &= !strcmp(h1->map.name, h2->map.name); - if (e1->flags & (1 << NFTNL_EXPR_HASH_SET_ID)) - eq &= (h1->map.id == h2->map.id); - - return eq; -} - struct expr_ops expr_ops_hash = { .name = "hash", .alloc_len = sizeof(struct nftnl_expr_hash), .max_attr = NFTA_HASH_MAX, - .cmp = nftnl_expr_hash_cmp, .set = nftnl_expr_hash_set, .get = nftnl_expr_hash_get, .parse = nftnl_expr_hash_parse, -- cgit v1.2.3