Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f7340ef authored by Eric Leblond's avatar Eric Leblond Committed by Patrick McHardy
Browse files

netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module. 



This patch modifies xt_NFLOG to suppress the call to nf_log_packet()
function. The call of this wrapper in xt_NFLOG was causing NFLOG to
use the first initialized module. Thus, if ipt_ULOG is loaded before
nfnetlink_log all NFLOG rules are treated as plain LOG rules.

Signed-off-by: default avatarEric Leblond <eric@inl.fr>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d2ad3ca8

include/net/netfilter/nfnetlink_log.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _KER_NFNETLINK_LOG_H

#define _KER_NFNETLINK_LOG_H



void

nfulnl_log_packet(unsigned int pf,

		  unsigned int hooknum,

		  const struct sk_buff *skb,

		  const struct net_device *in,

		  const struct net_device *out,

		  const struct nf_loginfo *li_user,

		  const char *prefix);



#endif /* _KER_NFNETLINK_LOG_H */

net/netfilter/nfnetlink_log.c

+2 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static struct nf_loginfo default_loginfo = { 
};



/* log handler for internal netfilter logging api */

static void

void

nfulnl_log_packet(u_int8_t pf,

		  unsigned int hooknum,

		  const struct sk_buff *skb,
@@ -648,6 +648,7 @@ nfulnl_log_packet(u_int8_t pf, 
	/* FIXME: statistics */

	goto unlock_and_release;

}

EXPORT_SYMBOL_GPL(nfulnl_log_packet);



static int

nfulnl_rcv_nl_event(struct notifier_block *this,

net/netfilter/xt_NFLOG.c

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_NFLOG.h>

#include <net/netfilter/nf_log.h>

#include <net/netfilter/nfnetlink_log.h>



MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");

MODULE_DESCRIPTION("Xtables: packet logging to netlink using NFLOG");
@@ -31,8 +32,8 @@ nflog_tg(struct sk_buff *skb, const struct xt_target_param *par) 
	li.u.ulog.group	     = info->group;

	li.u.ulog.qthreshold = info->threshold;



	nf_log_packet(par->family, par->hooknum, skb, par->in,

	              par->out, &li, "%s", info->prefix);

	nfulnl_log_packet(par->family, par->hooknum, skb, par->in,

			  par->out, &li, info->prefix);

	return XT_CONTINUE;

}