From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Leblond Subject: [PATCH 5/6] netfilter: print the list of register loggers. Date: Wed, 7 Jan 2009 21:05:33 +0100 Message-ID: <1231358734-20958-5-git-send-email-eric@inl.fr> References: <1231312622.4137.7.camel@ice-age> Cc: netfilter-devel@vger.kernel.org, Eric Leblond To: kaber@trash.net Return-path: Received: from bayen.regit.org ([81.57.69.189]:42377 "EHLO ice-age" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754197AbZAGUFk (ORCPT ); Wed, 7 Jan 2009 15:05:40 -0500 In-Reply-To: <1231312622.4137.7.camel@ice-age> Sender: netfilter-devel-owner@vger.kernel.org List-ID: This patch modifies the proc output to add display of registered loggers. The content of /proc/net/netfilter/nf_log is modified. Instead of displaying a protocol per line with format: proto:logger it now displays: proto:logger (comma_separated_list_of_loggers) Signed-off-by: Eric Leblond --- net/netfilter/nf_log.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 1655a1f..ee08b62 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c @@ -172,13 +172,26 @@ static int seq_show(struct seq_file *s, void *v) { loff_t *pos = v; const struct nf_logger *logger; + struct nf_logger *t; + char loggers_string[256]; + int len = 256; logger = rcu_dereference(nf_loggers[*pos]); + memset(loggers_string, 0, len); + list_for_each_entry(t, &nf_loggers_l[*pos], list[*pos]) { + strncat(loggers_string, t->name, len); + strncat(loggers_string, ",", 1); + len -= strlen(t->name) + 1; + } + if (strlen(loggers_string)) + loggers_string[strlen(loggers_string) -1] = 0; + if (!logger) - return seq_printf(s, "%2lld NONE\n", *pos); + return seq_printf(s, "%2lld NONE (%s)\n", *pos, loggers_string); - return seq_printf(s, "%2lld %s\n", *pos, logger->name); + return seq_printf(s, "%2lld %s (%s)\n", *pos, logger->name, + loggers_string); } static const struct seq_operations nflog_seq_ops = { -- 1.6.1