- rename nf_logging to nf_loggers since its an array of registered loggers
- rename nf_log_unregister_logger() to nf_log_unregister() to make it
symetrical to nf_log_register() and convert all users
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
/* Function to register/unregister log function. */
int nf_log_register(int pf, struct nf_logger *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_pf(int pf);
-void nf_log_unregister_logger(struct nf_logger *logger);
/* Calls the registered backend logging function */
void nf_log_packet(int pf,
/* Calls the registered backend logging function */
void nf_log_packet(int pf,
static void __exit ebt_log_fini(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);
}
ebt_unregister_watcher(&log);
}
ebt_ulog_buff_t *ub;
int i;
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];
ebt_unregister_watcher(&ulog);
for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
ub = &ulog_buffers[i];
static void __exit ipt_log_fini(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);
}
xt_unregister_target(&ipt_log_reg);
}
DEBUGP("ipt_ULOG: cleanup_module\n");
if (nflog)
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);
xt_unregister_target(&ipt_ulog_reg);
sock_release(nflognl->sk_socket);
static void __exit ip6t_log_fini(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);
}
xt_unregister_target(&ip6t_log_reg);
}
#define NF_LOG_PREFIXLEN 128
#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
static DEFINE_MUTEX(nf_log_mutex);
/* return EBUSY if somebody else is registered, EEXIST if the same logger
- 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;
ret = -EEXIST;
else
ret = -EBUSY;
if (pf >= NPROTO)
return;
mutex_lock(&nf_log_mutex);
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. */
mutex_unlock(&nf_log_mutex);
/* Give time to concurrent readers. */
}
EXPORT_SYMBOL(nf_log_unregister_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++) {
{
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();
}
}
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,
void nf_log_packet(int pf,
unsigned int hooknum,
struct nf_logger *logger;
rcu_read_lock();
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);
if (logger) {
va_start(args, fmt);
vsnprintf(prefix, sizeof(prefix), fmt, args);
loff_t *pos = v;
const struct nf_logger *logger;
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);
if (!logger)
return seq_printf(s, "%2lld NONE\n", *pos);
static void __exit nfnetlink_log_fini(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
#ifdef CONFIG_PROC_FS
remove_proc_entry("nfnetlink_log", proc_net_netfilter);
#endif