From: Eric Leblond <eric@inl.fr>
To: kaber@trash.net, jengelh@medozas.de
Cc: netfilter-devel@vger.kernel.org, Eric Leblond <eric@inl.fr>
Subject: [PATCH 3/6] netfilter: bind at registration if no logger is already set.
Date: Thu, 8 Jan 2009 23:03:11 +0100 [thread overview]
Message-ID: <1231452194-7800-3-git-send-email-eric@inl.fr> (raw)
In-Reply-To: <1231452093.10299.2.camel@ice-age>
This patch adds a bind operation when registration is done and when
there is currently no logger defined for the protocol. This emulates the
first registered wins policy and thus achieves backward compatibility.
Signed-off-by: Eric Leblond <eric@inl.fr>
---
net/netfilter/nf_log.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index a1dcd46..1655a1f 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -35,6 +35,7 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger)
int nf_log_register(u_int8_t pf, struct nf_logger *logger)
{
int ret;
+ const struct nf_logger *llog;
if (pf >= ARRAY_SIZE(nf_loggers))
return -EINVAL;
@@ -58,13 +59,17 @@ int nf_log_register(u_int8_t pf, struct nf_logger *logger)
if (__find_logger(pf, logger->name) == NULL) {
ret = 0;
INIT_LIST_HEAD(&(logger->list[pf]));
- /* register at end of list to honor first register win */
list_add_tail(&(logger->list[pf]),
&nf_loggers_l[pf]);
+ llog = rcu_dereference(nf_loggers[pf]);
+ if (llog == NULL)
+ rcu_assign_pointer(nf_loggers[pf], logger);
}
}
spin_unlock_bh(&nf_log_lock);
+
+ synchronize_rcu();
return ret;
}
EXPORT_SYMBOL(nf_log_register);
--
1.5.6.3
next prev parent reply other threads:[~2009-01-08 22:03 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-02 17:04 [netfilter 0/5] nf_log refactoring Eric Leblond
2009-01-02 17:07 ` [PATCH 1/5] netfilter: use a linked list of loggers Eric Leblond
2009-01-02 17:07 ` [PATCH 2/5] netfilter: suppress nf_log_unregister_pf function Eric Leblond
2009-01-02 17:07 ` [PATCH 3/5] netfilter: convert logger modules to new API Eric Leblond
2009-01-07 7:17 ` Eric Leblond
2009-01-07 20:05 ` [PATCH 1/6] netfilter: use a linked list of loggers Eric Leblond
2009-01-07 20:05 ` [PATCH 2/6] netfilter: suppress nf_log_unregister_pf function Eric Leblond
2009-01-07 20:05 ` [PATCH 3/6] netfilter: bind at registration if no logger is already set Eric Leblond
2009-01-07 20:05 ` [PATCH 4/6] netfilter: convert logger modules to new API Eric Leblond
2009-01-07 23:53 ` Jan Engelhardt
2009-01-07 20:05 ` [PATCH 5/6] netfilter: print the list of register loggers Eric Leblond
2009-01-07 23:56 ` Jan Engelhardt
2009-01-08 22:01 ` [PATCH 0/6] rework of nf_log refactoring Eric Leblond
2009-01-08 22:03 ` [PATCH 1/6] netfilter: use a linked list of loggers Eric Leblond
2009-01-08 22:03 ` [PATCH 2/6] netfilter: suppress nf_log_unregister_pf function Eric Leblond
2009-01-08 22:03 ` Eric Leblond [this message]
2009-01-08 22:03 ` [PATCH 4/6] netfilter: convert logger modules to new API Eric Leblond
2009-01-08 22:03 ` [PATCH 5/6] netfilter: print the list of register loggers Eric Leblond
2009-01-08 22:03 ` [PATCH 6/6] netfilter: sysctl support of logger choice Eric Leblond
2009-01-12 7:14 ` [PATCH] netfilter: desactivate nf_log logger via sysctl Eric Leblond
2009-02-09 17:43 ` [PATCH 0/6] rework of nf_log refactoring Patrick McHardy
2009-02-09 21:08 ` Eric Leblond
2009-02-09 21:11 ` [PATCH 1/7] netfilter: use a linked list of loggers Eric Leblond
2009-02-11 14:13 ` Patrick McHardy
2009-02-15 12:33 ` Eric Leblond
2009-02-15 12:37 ` [PATCH 1/4] " Eric Leblond
2009-02-18 16:08 ` Patrick McHardy
2009-02-15 12:37 ` [PATCH 2/4] netfilter: suppress now unused nf_log_unregister_pf() function Eric Leblond
2009-02-18 16:10 ` Patrick McHardy
2009-02-15 12:37 ` [PATCH 3/4] netfilter: print the list of register loggers Eric Leblond
2009-02-16 17:01 ` Jan Engelhardt
2009-02-16 17:11 ` Patrick McHardy
2009-02-15 12:37 ` [PATCH 4/4] netfilter: sysctl support of logger choice Eric Leblond
2009-02-18 15:56 ` Patrick McHardy
2009-02-19 20:59 ` Eric Leblond
2009-02-19 21:02 ` Patrick McHardy
2009-02-19 21:52 ` Eric Leblond
2009-02-19 21:54 ` [PATCH 1/3] netfilter: use a linked list of loggers Eric Leblond
2009-03-16 13:54 ` Patrick McHardy
2009-02-19 21:54 ` [PATCH 2/3] netfilter: print the list of register loggers Eric Leblond
2009-03-16 13:56 ` Patrick McHardy
2009-02-19 21:54 ` [PATCH 3/3] netfilter: sysctl support of logger choice Eric Leblond
2009-03-16 13:58 ` Patrick McHardy
2009-03-17 23:15 ` Eric Leblond
2009-03-17 23:27 ` [PATCH] " Eric Leblond
2009-03-19 9:45 ` Patrick McHardy
2009-03-19 21:46 ` Eric Leblond
2009-03-23 12:17 ` Patrick McHardy
2009-02-09 21:11 ` [PATCH 2/7] netfilter: suppress nf_log_unregister_pf function Eric Leblond
2009-02-09 21:11 ` [PATCH 3/7] netfilter: bind at registration if no logger is already set Eric Leblond
2009-02-09 21:11 ` [PATCH 4/7] netfilter: convert logger modules to new API Eric Leblond
2009-02-09 21:11 ` [PATCH 5/7] netfilter: print the list of register loggers Eric Leblond
2009-02-09 21:11 ` [PATCH 6/7] netfilter: sysctl support of logger choice Eric Leblond
2009-02-11 14:21 ` Patrick McHardy
2009-02-09 21:11 ` [PATCH 7/7] netfilter: fix nflog timeout handling Eric Leblond
2009-02-11 14:33 ` Patrick McHardy
2009-01-07 20:05 ` [PATCH 6/6] netfilter: sysctl support of logger choice Eric Leblond
2009-01-02 17:07 ` [PATCH 4/5] netfilter: print the list of register loggers Eric Leblond
2009-01-02 17:07 ` [PATCH 5/5] netfilter: sysctl support of logger choice Eric Leblond
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=1231452194-7800-3-git-send-email-eric@inl.fr \
--to=eric@inl.fr \
--cc=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.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).