From: Richard Weinberger <richard@nod.at>
To: netfilter-devel@vger.kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
eric.dumazet@gmail.com, jengelh@medozas.de, rostedt@goodmis.org,
pablo@netfilter.org, basti@b-bl.de,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 2/2] Netfilter: xt_LOG: Add timestamp support
Date: Wed, 15 Feb 2012 14:55:15 +0100 [thread overview]
Message-ID: <1329314115-6899-2-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1329314115-6899-1-git-send-email-richard@nod.at>
Using XT_LOG_ADD_TIMESTAMP it is possible to have a timestamp
directly in the log message.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/linux/netfilter/xt_LOG.h | 1 +
net/netfilter/xt_LOG.c | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/include/linux/netfilter/xt_LOG.h b/include/linux/netfilter/xt_LOG.h
index e4b1177..d84710c 100644
--- a/include/linux/netfilter/xt_LOG.h
+++ b/include/linux/netfilter/xt_LOG.h
@@ -8,6 +8,7 @@
#define XT_LOG_UID 0x08 /* Log UID owning local socket */
#define XT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
#define XT_LOG_MACDECODE 0x20 /* Decode MAC header */
+#define XT_LOG_ADD_TIMESTAMP 0x40 /* Add a timestamp */
#define XT_LOG_MASK 0x6f
struct xt_log_info {
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c
index 211d341..2af2621 100644
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@ -490,6 +490,15 @@ log_packet_common(struct sbuff *m,
if (loginfo->type == NF_LOG_TYPE_LOG)
sb_add(m, "<%d>", loginfo->u.log.level);
+ if (loginfo->u.log.logflags & XT_LOG_ADD_TIMESTAMP) {
+ struct timespec tv;
+ unsigned int msec;
+
+ getnstimeofday(&tv);
+ msec = tv.tv_nsec / NSEC_PER_MSEC;
+ sb_add(m, "TIMESTAMP=%li.%03li ", tv.tv_sec, msec);
+ }
+
sb_add(m, "%sIN=%s OUT=%s ", prefix, in ? in->name : "",
out ? out->name : "");
#ifdef CONFIG_BRIDGE_NETFILTER
--
1.7.7.3
next prev parent reply other threads:[~2012-02-15 13:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 13:55 [PATCH 1/2] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-02-15 13:55 ` Richard Weinberger [this message]
2012-02-15 14:01 ` [PATCH 2/2] Netfilter: xt_LOG: Add timestamp support Eric Dumazet
2012-02-15 14:07 ` Richard Weinberger
2012-02-15 17:16 ` Jan Engelhardt
2012-02-15 19:39 ` Richard Weinberger
-- strict thread matches above, loose matches on Subject: below --
2012-02-15 23:27 [PATCH 1/2] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-02-15 23:28 ` [PATCH 2/2] Netfilter: xt_LOG: Add timestamp support Richard Weinberger
2012-02-14 23:36 [PATCH 1/2] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-02-14 23:36 ` [PATCH 2/2] Netfilter: xt_LOG: Add timestamp support Richard Weinberger
2012-02-15 4:56 ` Eric Dumazet
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=1329314115-6899-2-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=basti@b-bl.de \
--cc=eric.dumazet@gmail.com \
--cc=jengelh@medozas.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=rostedt@goodmis.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).