diff options
author | Giuseppe Longo <giuseppelng@gmail.com> | 2013-07-05 10:06:28 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-05 13:06:23 +0200 |
commit | f95e8598af7e3a1641166b4e6be31b87d4690326 (patch) | |
tree | 21714a822cb02404ba68e1dfd9da3b39a082991e /src/rule.c | |
parent | 1085a4e18d297d8338cf9babe7e623e25a00f499 (diff) |
src: improve default text output
This patch improves default plain text output by mimicing the
default output of libnl-nft.
While at it, several %lu has been translated to use %"PRIu64"
for correctness.
[ I have added the policy to string translation --pablo ]
Signed-off-by: Giuseppe Longo <giuseppelng@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r-- | src/rule.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -18,6 +18,7 @@ #include <string.h> #include <netinet/in.h> #include <errno.h> +#include <inttypes.h> #include <libmnl/libmnl.h> #include <linux/netfilter/nfnetlink.h> @@ -745,18 +746,20 @@ static int nft_rule_snprintf_default(char *buf, size_t size, struct nft_rule *r, struct nft_rule_expr *expr; int ret, len = size, offset = 0; - ret = snprintf(buf, size, "family=%s table=%s chain=%s handle=%llu " - "flags=%x ", + ret = snprintf(buf, size, "%s %s %s %"PRIu64"\n", nft_family2str(r->family), r->table, r->chain, - (unsigned long long)r->handle, r->rule_flags); + r->handle); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); list_for_each_entry(expr, &r->expr_list, head) { - ret = snprintf(buf+offset, len, "%s ", expr->ops->name); + ret = snprintf(buf+offset, len, " [ %s ", expr->ops->name); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_rule_expr_snprintf(buf+offset, size, expr, type, flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, len, "]\n"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } return offset; |