From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft 2/4] ct: refactor print function so it can be re-used for ct statement
Date: Tue, 28 Feb 2017 01:03:46 +0100 [thread overview]
Message-ID: <1488240228-1536-2-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1488240228-1536-1-git-send-email-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
Once directional zone support is added we also need to print the
direction of the statement, so factor the common code to re-use
this helper from the statement print function.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
Just a rebase on top of series to store byteorder for set data in
NFTA_SET_USERDATA.
src/ct.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/ct.c b/src/ct.c
index 99f450a77c67..3a6a4e574d69 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -238,22 +238,27 @@ static const struct ct_template ct_templates[] = {
BYTEORDER_HOST_ENDIAN, 16),
};
-static void ct_expr_print(const struct expr *expr)
+static void ct_print(enum nft_ct_keys key, int8_t dir)
{
const struct symbolic_constant *s;
printf("ct ");
- if (expr->ct.direction < 0)
+ if (dir < 0)
goto done;
for (s = ct_dir_tbl.symbols; s->identifier != NULL; s++) {
- if (expr->ct.direction == (int) s->value) {
+ if (dir == (int)s->value) {
printf("%s ", s->identifier);
break;
}
}
done:
- printf("%s", ct_templates[expr->ct.key].token);
+ printf("%s", ct_templates[key].token);
+}
+
+static void ct_expr_print(const struct expr *expr)
+{
+ ct_print(expr->ct.key, expr->ct.direction);
}
static bool ct_expr_cmp(const struct expr *e1, const struct expr *e2)
--
2.1.4
next prev parent reply other threads:[~2017-02-28 2:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 0:03 [PATCH nft 1/4] src: add conntrack zone support Pablo Neira Ayuso
2017-02-28 0:03 ` Pablo Neira Ayuso [this message]
2017-02-28 0:03 ` [PATCH nft 3/4] src: support zone set statement with optional direction Pablo Neira Ayuso
2017-02-28 0:03 ` [PATCH nft 4/4] tests: add test entries for conntrack zones Pablo Neira Ayuso
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=1488240228-1536-2-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.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).