From: "Carlos Falgueras García" <carlosfg@riseup.net>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [PATCH libnftnl] expr: hash: Add comparator to hash expression
Date: Thu, 18 Aug 2016 07:24:15 +0200 [thread overview]
Message-ID: <20160818052415.22524-1-carlosfg@riseup.net> (raw)
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
next reply other threads:[~2016-08-18 5:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 5:24 Carlos Falgueras García [this message]
2016-08-18 5:32 ` [PATCH libnftnl] expr: hash: Add comparator to hash expression Carlos Falgueras García
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160818052415.22524-1-carlosfg@riseup.net \
--to=carlosfg@riseup.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).