From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Richard Weinberger <richard@nod.at>
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
Subject: Re: [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support
Date: Wed, 7 Mar 2012 16:29:10 +0100 [thread overview]
Message-ID: <20120307152910.GA7044@1984> (raw)
In-Reply-To: <1330989588-26833-7-git-send-email-richard@nod.at>
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 <richard@nod.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);
net/netfilter/xt_LOG.c: In function ‘log_packet_common’:
net/netfilter/xt_LOG.c:507:4: warning: format ‘%u’ expects argument of
type ‘unsigned int’, but argument 4 has type ‘long int’ [-Wformat]
It has to be:
sb_add(m, "TIMESTAMP=%li.%03u ", tv.tv_sec,
(unsigned int)(tv.tv_nsec / NSEC_PER_MSEC));
^ ^
I've fixed, no need to resend this patch.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-03-07 15:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 23:19 [PATCH v6] Netfilter ring buffer support Richard Weinberger
2012-03-05 23:19 ` [PATCH 1/6] Netfilter: Merge ipt_LOG and ip6_LOG into xt_LOG Richard Weinberger
2012-03-05 23:19 ` [PATCH 2/6] netfilter: xt_LOG: fix bogus extra layer-4 logging information Richard Weinberger
2012-03-05 23:19 ` [PATCH 3/6] ring_buffer: Export for_each_buffer_cpu() Richard Weinberger
2012-03-05 23:19 ` [PATCH 4/6] xt_log: Make printk() in sb_close() optional Richard Weinberger
2012-03-05 23:19 ` [PATCH 5/6] Netfilter: xt_LOG: Implement ring buffer support Richard Weinberger
2012-03-06 2:47 ` Steven Rostedt
2012-03-05 23:19 ` [PATCH 6/6] Netfilter: xt_LOG: Add timestamp support Richard Weinberger
2012-03-07 15:29 ` Pablo Neira Ayuso [this message]
2012-03-07 15:33 ` Richard Weinberger
2012-03-07 15:40 ` Eric Dumazet
2012-03-08 1:28 ` [PATCH v6] Netfilter ring buffer support Pablo Neira Ayuso
2012-03-08 9:02 ` Richard Weinberger
2012-03-12 13:08 ` Pablo Neira Ayuso
2012-03-12 13:27 ` Richard Weinberger
2012-03-12 14:12 ` Pablo Neira Ayuso
2012-03-12 18:00 ` Richard Weinberger
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=20120307152910.GA7044@1984 \
--to=pablo@netfilter.org \
--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=richard@nod.at \
--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).