From patchwork Mon Mar 5 23:19:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 144790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D8D7AB6FA8 for ; Tue, 6 Mar 2012 10:20:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757798Ab2CEXUc (ORCPT ); Mon, 5 Mar 2012 18:20:32 -0500 Received: from a.ns.miles-group.at ([95.130.255.143]:47854 "EHLO radon.swed.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757654Ab2CEXUG (ORCPT ); Mon, 5 Mar 2012 18:20:06 -0500 Received: (qmail 23120 invoked by uid 89); 5 Mar 2012 23:20:04 -0000 Received: by simscan 1.3.1 ppid: 23007, pid: 23117, t: 0.1282s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO raccoon.haslach.nod.at) (richard@nod.at@212.183.102.115) by radon.swed.at with ESMTPA; 5 Mar 2012 23:20:04 -0000 From: Richard Weinberger To: pablo@netfilter.org Cc: jengelh@medozas.de, eric.dumazet@gmail.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, rostedt@goodmis.org, Richard Weinberger Subject: [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support Date: Tue, 6 Mar 2012 00:19:48 +0100 Message-Id: <1330989588-26833-7-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1330989588-26833-1-git-send-email-richard@nod.at> References: <1330989588-26833-1-git-send-email-richard@nod.at> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Using XT_LOG_ADD_TIMESTAMP it is possible to have a timestamp directly in the log message. Signed-off-by: Richard Weinberger --- 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