From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft] expression: fix output of verdict maps
Date: Mon, 13 Jan 2014 13:39:16 +0100 [thread overview]
Message-ID: <1389616756-8326-1-git-send-email-pablo@netfilter.org> (raw)
% nft list table filter
table ip filter {
...
chain output {
...
ip saddr map { 1.1.1.1 => accept}
}
}
It displays 'map' instead of 'vmap'. Fix it by checking the mapping
type in map_expr_print().
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/expression.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/expression.c b/src/expression.c
index 71154cc..97481d0 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -689,7 +689,11 @@ struct expr *mapping_expr_alloc(const struct location *loc,
static void map_expr_print(const struct expr *expr)
{
expr_print(expr->map);
- printf(" map ");
+ if (expr->mappings->ops->type == EXPR_SET_REF &&
+ expr->mappings->set->datatype->type == TYPE_VERDICT)
+ printf(" vmap ");
+ else
+ printf(" map ");
expr_print(expr->mappings);
}
--
1.7.10.4
next reply other threads:[~2014-01-13 12:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 12:39 Pablo Neira Ayuso [this message]
2014-01-13 12:42 ` [PATCH nft] expression: fix output of verdict maps Patrick McHardy
2014-01-14 9:00 ` Patrick McHardy
2014-01-14 11:29 ` Pablo Neira Ayuso
2014-01-14 12:33 ` Patrick McHardy
2014-01-16 16:53 ` Pablo Neira Ayuso
2014-01-16 16:57 ` Patrick McHardy
2014-01-16 17:03 ` 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=1389616756-8326-1-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).