From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Weinberger Subject: Re: [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support Date: Wed, 07 Mar 2012 16:33:41 +0100 Message-ID: <4F577FD5.9080601@nod.at> References: <1330989588-26833-1-git-send-email-richard@nod.at> <1330989588-26833-7-git-send-email-richard@nod.at> <20120307152910.GA7044@1984> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE 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 To: Pablo Neira Ayuso Return-path: Received: from a.ns.miles-group.at ([95.130.255.143]:47835 "EHLO radon.swed.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932240Ab2CGPdq (ORCPT ); Wed, 7 Mar 2012 10:33:46 -0500 In-Reply-To: <20120307152910.GA7044@1984> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On 07.03.2012 16:29, Pablo Neira Ayuso wrote: > On Tue, Mar 06, 2012 at 12:19:48AM +0100, Richard Weinberger wrote: >> 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/netfil= ter/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 =3D=3D 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=3D%li.%03u ", tv.tv_sec, >> + (unsigned int)tv.tv_nsec / NSEC_PER_MSEC); > > net/netfilter/xt_LOG.c: In function =E2=80=98log_packet_common=E2=80=99= : > net/netfilter/xt_LOG.c:507:4: warning: format =E2=80=98%u=E2=80=99 ex= pects argument of > type =E2=80=98unsigned int=E2=80=99, but argument 4 has type =E2=80=98= long int=E2=80=99 [-Wformat] > > It has to be: > > sb_add(m, "TIMESTAMP=3D%li.%03u ", tv.tv_sec, > (unsigned int)(tv.tv_nsec / NSEC_PER_MSEC)); > ^ ^ > I've fixed, no need to resend this patch. Which gcc version are you using? I've not seen this warning. :( Thanks, //richard -- To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html