From: Florian Westphal <fw@strlen.de>
To: netfilter-devel <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH][libnetfilter_conntrack] snprintf: print conntrack helper name, too
Date: Fri, 18 May 2012 13:35:59 +0200 [thread overview]
Message-ID: <1337340959-15183-1-git-send-email-fw@strlen.de> (raw)
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/conntrack/snprintf_default.c | 11 +++++++++++
src/conntrack/snprintf_xml.c | 16 ++++++++++++++++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c
index 206b9c0..45d192d 100644
--- a/src/conntrack/snprintf_default.c
+++ b/src/conntrack/snprintf_default.c
@@ -282,6 +282,12 @@ __snprintf_timestamp_delta(char *buf, unsigned int len,
(unsigned long long)delta_time));
}
+static int
+__snprintf_helper_name(char *buf, unsigned int len, const struct nf_conntrack *ct)
+{
+ return (snprintf(buf, len, "helper=%s ", ct->helper_name));
+}
+
int __snprintf_conntrack_default(char *buf,
unsigned int len,
const struct nf_conntrack *ct,
@@ -415,6 +421,11 @@ int __snprintf_conntrack_default(char *buf,
BUFFER_SIZE(ret, size, len, offset);
}
+ if (test_bit(ATTR_HELPER_NAME, ct->head.set)) {
+ ret = __snprintf_helper_name(buf+offset, len, ct);
+ BUFFER_SIZE(ret, size, len, offset);
+ }
+
/* Delete the last blank space */
size--;
diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c
index 756d118..ad53075 100644
--- a/src/conntrack/snprintf_xml.c
+++ b/src/conntrack/snprintf_xml.c
@@ -239,6 +239,18 @@ __snprintf_deltatime(char *buf, unsigned int len, const struct nf_conntrack *ct)
return size;
}
+static int
+__snprintf_helper_name(char *buf, unsigned int len, const struct nf_conntrack *ct)
+{
+ int ret;
+ unsigned int size = 0, offset = 0;
+
+ ret = snprintf(buf+offset, len, "<helper>%s</helper>", ct->helper_name);
+ BUFFER_SIZE(ret, size, len, offset);
+
+ return size;
+}
+
int
__snprintf_localtime_xml(char *buf, unsigned int len, const struct tm *tm)
{
@@ -522,6 +534,10 @@ int __snprintf_conntrack_xml(char *buf,
BUFFER_SIZE(ret, size, len, offset);
}
+ if (test_bit(ATTR_HELPER_NAME, ct->head.set)) {
+ ret = __snprintf_helper_name(buf+offset, len, ct);
+ BUFFER_SIZE(ret, size, len, offset);
+ }
err_out:
ret = snprintf(buf+offset, len, "</flow>");
BUFFER_SIZE(ret, size, len, offset);
--
1.7.3.4
next reply other threads:[~2012-05-18 11:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 11:35 Florian Westphal [this message]
2012-05-20 20:20 ` [PATCH][libnetfilter_conntrack] snprintf: print conntrack helper name, too 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=1337340959-15183-1-git-send-email-fw@strlen.de \
--to=fw@strlen.de \
--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).