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/log.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/expr/log.c') diff --git a/src/expr/log.c b/src/expr/log.c index 1119c53..bbe43d2 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -258,35 +258,11 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e) xfree(log->prefix); } -static bool nftnl_expr_log_cmp(const struct nftnl_expr *e1, - const struct nftnl_expr *e2) -{ - struct nftnl_expr_log *l1 = nftnl_expr_data(e1); - struct nftnl_expr_log *l2 = nftnl_expr_data(e2); - bool eq = true; - - if (e1->flags & (1 << NFTNL_EXPR_LOG_SNAPLEN)) - eq &= (l1->snaplen == l2->snaplen); - if (e1->flags & (1 << NFTNL_EXPR_LOG_GROUP)) - eq &= (l1->group == l2->group); - if (e1->flags & (1 << NFTNL_EXPR_LOG_QTHRESHOLD)) - eq &= (l1->qthreshold == l2->qthreshold); - if (e1->flags & (1 << NFTNL_EXPR_LOG_LEVEL)) - eq &= (l1->level == l2->level); - if (e1->flags & (1 << NFTNL_EXPR_LOG_FLAGS)) - eq &= (l1->flags == l2->flags); - if (e1->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) - eq &= !strcmp(l1->prefix, l2->prefix); - - return eq; -} - struct expr_ops expr_ops_log = { .name = "log", .alloc_len = sizeof(struct nftnl_expr_log), .max_attr = NFTA_LOG_MAX, .free = nftnl_expr_log_free, - .cmp = nftnl_expr_log_cmp, .set = nftnl_expr_log_set, .get = nftnl_expr_log_get, .parse = nftnl_expr_log_parse, -- cgit v1.2.3