* [PATCH libnftnl] expr: numgen: add missing nftnl_expr_ng_cmp()
@ 2016-08-30 14:17 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2016-08-30 14:17 UTC (permalink / raw)
To: netfilter-devel; +Cc: nevola
This patch adds the missing comparator interface, most likely due to
race between the patchset that has added this and the introduction of
numgen.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/expr/numgen.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index e8fa9a1..0669eda 100644
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -238,10 +238,28 @@ nftnl_expr_ng_snprintf(char *buf, size_t len, uint32_t type,
return -1;
}
+static bool nftnl_expr_ng_cmp(const struct nftnl_expr *e1,
+ const struct nftnl_expr *e2)
+{
+ struct nftnl_expr_ng *n1 = nftnl_expr_data(e1);
+ struct nftnl_expr_ng *n2 = nftnl_expr_data(e2);
+ bool eq = true;
+
+ if (e1->flags & (1 << NFTNL_EXPR_NG_DREG))
+ eq &= (n1->dreg == n2->dreg);
+ if (e1->flags & (1 << NFTNL_EXPR_NG_UNTIL))
+ eq &= (n1->until == n2->until);
+ if (e1->flags & (1 << NFTNL_EXPR_NG_TYPE))
+ eq &= (n1->type == n2->type);
+
+ return eq;
+}
+
struct expr_ops expr_ops_ng = {
.name = "numgen",
.alloc_len = sizeof(struct nftnl_expr_ng),
.max_attr = NFTA_NG_MAX,
+ .cmp = nftnl_expr_ng_cmp,
.set = nftnl_expr_ng_set,
.get = nftnl_expr_ng_get,
.parse = nftnl_expr_ng_parse,
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-30 14:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-30 14:17 [PATCH libnftnl] expr: numgen: add missing nftnl_expr_ng_cmp() Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).