From 28d9cea7fb58568006160176f5f0a24d5a140a12 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 12 Feb 2007 11:11:55 -0800 Subject: [PATCH] --- yaml --- r: 48103 b: refs/heads/master c: e92ad99c78de09a5ba0746e1c0ee27cc7450c64d h: refs/heads/master i: 48101: 36504929c2b638946641b1d70c24022a21eb40a5 48099: 44523c7e5b190b1a26c18391f1a2a02ffdcedb54 48095: b6d9fdcbf4403682209add00912a88c6316efc92 v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter.h | 2 +- trunk/net/bridge/netfilter/ebt_log.c | 2 +- trunk/net/bridge/netfilter/ebt_ulog.c | 2 +- trunk/net/ipv4/netfilter/ipt_LOG.c | 2 +- trunk/net/ipv4/netfilter/ipt_ULOG.c | 2 +- trunk/net/ipv6/netfilter/ip6t_LOG.c | 2 +- trunk/net/netfilter/nf_log.c | 22 +++++++++++----------- trunk/net/netfilter/nfnetlink_log.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 82f193d10def..ba9d333342ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b73534dc57fa2fd5ef567586adb83c16e88a52f +refs/heads/master: e92ad99c78de09a5ba0746e1c0ee27cc7450c64d diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h index 18a67908a330..70d3b4f1e48d 100644 --- a/trunk/include/linux/netfilter.h +++ b/trunk/include/linux/netfilter.h @@ -172,8 +172,8 @@ struct nf_logger { /* Function to register/unregister log function. */ int nf_log_register(int pf, struct nf_logger *logger); +void nf_log_unregister(struct nf_logger *logger); void nf_log_unregister_pf(int pf); -void nf_log_unregister_logger(struct nf_logger *logger); /* Calls the registered backend logging function */ void nf_log_packet(int pf, diff --git a/trunk/net/bridge/netfilter/ebt_log.c b/trunk/net/bridge/netfilter/ebt_log.c index f9a5ae9d5b6d..45712aec6a0e 100644 --- a/trunk/net/bridge/netfilter/ebt_log.c +++ b/trunk/net/bridge/netfilter/ebt_log.c @@ -208,7 +208,7 @@ static int __init ebt_log_init(void) static void __exit ebt_log_fini(void) { - nf_log_unregister_logger(&ebt_log_logger); + nf_log_unregister(&ebt_log_logger); ebt_unregister_watcher(&log); } diff --git a/trunk/net/bridge/netfilter/ebt_ulog.c b/trunk/net/bridge/netfilter/ebt_ulog.c index 2e4cb24e191a..8e15cc47f6c0 100644 --- a/trunk/net/bridge/netfilter/ebt_ulog.c +++ b/trunk/net/bridge/netfilter/ebt_ulog.c @@ -323,7 +323,7 @@ static void __exit ebt_ulog_fini(void) ebt_ulog_buff_t *ub; int i; - nf_log_unregister_logger(&ebt_ulog_logger); + nf_log_unregister(&ebt_ulog_logger); ebt_unregister_watcher(&ulog); for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) { ub = &ulog_buffers[i]; diff --git a/trunk/net/ipv4/netfilter/ipt_LOG.c b/trunk/net/ipv4/netfilter/ipt_LOG.c index f4a62f2522ff..d9c37fd94228 100644 --- a/trunk/net/ipv4/netfilter/ipt_LOG.c +++ b/trunk/net/ipv4/netfilter/ipt_LOG.c @@ -489,7 +489,7 @@ static int __init ipt_log_init(void) static void __exit ipt_log_fini(void) { - nf_log_unregister_logger(&ipt_log_logger); + nf_log_unregister(&ipt_log_logger); xt_unregister_target(&ipt_log_reg); } diff --git a/trunk/net/ipv4/netfilter/ipt_ULOG.c b/trunk/net/ipv4/netfilter/ipt_ULOG.c index 3a1eacc634b3..a26404dbe212 100644 --- a/trunk/net/ipv4/netfilter/ipt_ULOG.c +++ b/trunk/net/ipv4/netfilter/ipt_ULOG.c @@ -419,7 +419,7 @@ static void __exit ipt_ulog_fini(void) DEBUGP("ipt_ULOG: cleanup_module\n"); if (nflog) - nf_log_unregister_logger(&ipt_ulog_logger); + nf_log_unregister(&ipt_ulog_logger); xt_unregister_target(&ipt_ulog_reg); sock_release(nflognl->sk_socket); diff --git a/trunk/net/ipv6/netfilter/ip6t_LOG.c b/trunk/net/ipv6/netfilter/ip6t_LOG.c index dc9ec9305778..afaa039d0b7b 100644 --- a/trunk/net/ipv6/netfilter/ip6t_LOG.c +++ b/trunk/net/ipv6/netfilter/ip6t_LOG.c @@ -501,7 +501,7 @@ static int __init ip6t_log_init(void) static void __exit ip6t_log_fini(void) { - nf_log_unregister_logger(&ip6t_logger); + nf_log_unregister(&ip6t_logger); xt_unregister_target(&ip6t_log_reg); } diff --git a/trunk/net/netfilter/nf_log.c b/trunk/net/netfilter/nf_log.c index 243d66b1c02c..c48aab50341d 100644 --- a/trunk/net/netfilter/nf_log.c +++ b/trunk/net/netfilter/nf_log.c @@ -14,7 +14,7 @@ #define NF_LOG_PREFIXLEN 128 -static struct nf_logger *nf_logging[NPROTO]; /* = NULL */ +static struct nf_logger *nf_loggers[NPROTO]; static DEFINE_MUTEX(nf_log_mutex); /* return EBUSY if somebody else is registered, EEXIST if the same logger @@ -32,9 +32,9 @@ int nf_log_register(int pf, struct nf_logger *logger) if (ret < 0) return ret; - if (!nf_logging[pf]) - rcu_assign_pointer(nf_logging[pf], logger); - else if (nf_logging[pf] == logger) + if (!nf_loggers[pf]) + rcu_assign_pointer(nf_loggers[pf], logger); + else if (nf_loggers[pf] == logger) ret = -EEXIST; else ret = -EBUSY; @@ -49,7 +49,7 @@ void nf_log_unregister_pf(int pf) if (pf >= NPROTO) return; mutex_lock(&nf_log_mutex); - rcu_assign_pointer(nf_logging[pf], NULL); + rcu_assign_pointer(nf_loggers[pf], NULL); mutex_unlock(&nf_log_mutex); /* Give time to concurrent readers. */ @@ -57,20 +57,20 @@ void nf_log_unregister_pf(int pf) } EXPORT_SYMBOL(nf_log_unregister_pf); -void nf_log_unregister_logger(struct nf_logger *logger) +void nf_log_unregister(struct nf_logger *logger) { int i; mutex_lock(&nf_log_mutex); for (i = 0; i < NPROTO; i++) { - if (nf_logging[i] == logger) - rcu_assign_pointer(nf_logging[i], NULL); + if (nf_loggers[i] == logger) + rcu_assign_pointer(nf_loggers[i], NULL); } mutex_unlock(&nf_log_mutex); synchronize_rcu(); } -EXPORT_SYMBOL(nf_log_unregister_logger); +EXPORT_SYMBOL(nf_log_unregister); void nf_log_packet(int pf, unsigned int hooknum, @@ -85,7 +85,7 @@ void nf_log_packet(int pf, struct nf_logger *logger; rcu_read_lock(); - logger = rcu_dereference(nf_logging[pf]); + logger = rcu_dereference(nf_loggers[pf]); if (logger) { va_start(args, fmt); vsnprintf(prefix, sizeof(prefix), fmt, args); @@ -132,7 +132,7 @@ static int seq_show(struct seq_file *s, void *v) loff_t *pos = v; const struct nf_logger *logger; - logger = rcu_dereference(nf_logging[*pos]); + logger = rcu_dereference(nf_loggers[*pos]); if (!logger) return seq_printf(s, "%2lld NONE\n", *pos); diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c index c47e7e2ba642..edbb8ff635cc 100644 --- a/trunk/net/netfilter/nfnetlink_log.c +++ b/trunk/net/netfilter/nfnetlink_log.c @@ -1077,7 +1077,7 @@ static int __init nfnetlink_log_init(void) static void __exit nfnetlink_log_fini(void) { - nf_log_unregister_logger(&nfulnl_logger); + nf_log_unregister(&nfulnl_logger); #ifdef CONFIG_PROC_FS remove_proc_entry("nfnetlink_log", proc_net_netfilter); #endif