[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1330989588-26833-7-git-send-email-richard@nod.at>
Date: Tue, 6 Mar 2012 00:19:48 +0100
From: Richard Weinberger <richard@....at>
To: pablo@...filter.org
Cc: jengelh@...ozas.de, eric.dumazet@...il.com,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
netfilter-devel@...r.kernel.org, rostedt@...dmis.org,
Richard Weinberger <richard@....at>
Subject: [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support
Using XT_LOG_ADD_TIMESTAMP it is possible to have a timestamp
directly in the log message.
Signed-off-by: Richard Weinberger <richard@....at>
---
include/linux/netfilter/xt_LOG.h | 3 ++-
net/netfilter/xt_LOG.c | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/include/linux/netfilter/xt_LOG.h b/include/linux/netfilter/xt_LOG.h
index 8ac25e0..9361374 100644
--- a/include/linux/netfilter/xt_LOG.h
+++ b/include/linux/netfilter/xt_LOG.h
@@ -8,7 +8,8 @@
#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_MASK 0x2f
+#define XT_LOG_ADD_TIMESTAMP 0x40 /* Add a timestamp */
+#define XT_LOG_MASK 0x6f
struct xt_log_info {
unsigned char level;
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c
index f75f2d7..23db206 100644
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@ -499,6 +499,14 @@ 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;
+
+ getnstimeofday(&tv);
+ sb_add(m, "TIMESTAMP=%li.%03u ", tv.tv_sec,
+ (unsigned int)tv.tv_nsec / NSEC_PER_MSEC);
+ }
+
sb_add(m, "%sIN=%s OUT=%s ", prefix, in ? in->name : "",
out ? out->name : "");
#ifdef CONFIG_BRIDGE_NETFILTER
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists