* [PATCH libnftnl] expr: hash: Add comparator to hash expression
@ 2016-08-18 5:24 Carlos Falgueras García
2016-08-18 5:32 ` Carlos Falgueras García
0 siblings, 1 reply; 2+ messages in thread
From: Carlos Falgueras García @ 2016-08-18 5:24 UTC (permalink / raw)
To: netfilter-devel; +Cc: pablo
Comparators are mandatory so hash expression must have one.
Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net>
---
src/expr/hash.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/expr/hash.c b/src/expr/hash.c
index 7309907..01f362f 100644
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -280,10 +280,32 @@ 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;
+
+ 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,
--
2.8.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH libnftnl] expr: hash: Add comparator to hash expression
2016-08-18 5:24 [PATCH libnftnl] expr: hash: Add comparator to hash expression Carlos Falgueras García
@ 2016-08-18 5:32 ` Carlos Falgueras García
0 siblings, 0 replies; 2+ messages in thread
From: Carlos Falgueras García @ 2016-08-18 5:32 UTC (permalink / raw)
To: netfilter-devel
Please ignore this patch. Pablo already added this chunk before. Sorry.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-18 5:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-18 5:24 [PATCH libnftnl] expr: hash: Add comparator to hash expression Carlos Falgueras García
2016-08-18 5:32 ` Carlos Falgueras García
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).