From: Arturo Borrero <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftables PATCH 1/3] nat: xml: fix xml_snprintf buffer offset
Date: Sat, 15 Jun 2013 03:16:03 +0200 [thread overview]
Message-ID: <20130615011603.3778.67261.stgit@nfdev.cica.es> (raw)
This patch fix the buffer offset of the nat snprintf function,
so elements are properly printed.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/expr/nat.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/expr/nat.c b/src/expr/nat.c
index a76f5b5..448d2e3 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -336,19 +336,21 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,
break;
}
- ret = snprintf(buf, len, "<family>%s</family>",
+ ret = snprintf(buf+offset, len, "<family>%s</family>",
nat->family == AF_INET ? "AF_INET" : "AF_INET6");
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) {
- ret = snprintf(buf, len, "<sreg_addr_min_v4>%u</sreg_addr_min_v4>"
- " <sreg_addr_max_v4>%u</sreg_addr_max_v4> ",
+ ret = snprintf(buf+offset, len,
+ "<sreg_addr_min_v4>%u</sreg_addr_min_v4>"
+ "<sreg_addr_max_v4>%u</sreg_addr_max_v4>",
nat->sreg_addr_min, nat->sreg_addr_max);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
}
if (e->flags & (1 << NFT_EXPR_NAT_REG_PROTO_MIN)) {
- ret = snprintf(buf, len, "<sreg_proto_min>%u</sreg_proto_min>"
+ ret = snprintf(buf+offset, len,
+ "<sreg_proto_min>%u</sreg_proto_min>"
"<sreg_proto_max>%u</sreg_proto_max>",
nat->sreg_proto_min, nat->sreg_proto_max);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
next reply other threads:[~2013-06-15 1:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 1:16 Arturo Borrero [this message]
2013-06-15 1:16 ` [libnftables PATCH 2/3] nat: xml: fix non-mandatory element Arturo Borrero
2013-06-17 19:28 ` Pablo Neira Ayuso
2013-06-15 1:16 ` [libnftables PATCH 3/3] rule: xml: delete trailing space Arturo Borrero
2013-06-17 19:28 ` Pablo Neira Ayuso
2013-06-17 19:28 ` [libnftables PATCH 1/3] nat: xml: fix xml_snprintf buffer offset 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=20130615011603.3778.67261.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@gmail.com \
--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).