Commit 77ccee96 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_log_bridge: merge with nf_log_syslog 



Provide bridge log support from nf_log_syslog.

After the merge there is no need to load the "real packet loggers",
all of them now reside in the same module.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1510618e

include/net/netfilter/nf_log.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ void nf_log_unbind_pf(struct net *net, u_int8_t pf); 


int nf_logger_find_get(int pf, enum nf_log_type type);

void nf_logger_put(int pf, enum nf_log_type type);

void nf_logger_request_module(int pf, enum nf_log_type type);



#define MODULE_ALIAS_NF_LOGGER(family, type) \

	MODULE_ALIAS("nf-logger-" __stringify(family) "-" __stringify(type))

net/bridge/netfilter/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ config NFT_BRIDGE_REJECT 
	help

	  Add support to reject packets.



config NF_LOG_BRIDGE

	tristate "Bridge packet logging"

	select NF_LOG_COMMON



endif # NF_TABLES_BRIDGE



config NF_CONNTRACK_BRIDGE

net/bridge/netfilter/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ obj-$(CONFIG_NFT_BRIDGE_REJECT) += nft_reject_bridge.o 
# connection tracking

obj-$(CONFIG_NF_CONNTRACK_BRIDGE) += nf_conntrack_bridge.o



# packet logging

obj-$(CONFIG_NF_LOG_BRIDGE) += nf_log_bridge.o



obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o



# tables

net/bridge/netfilter/nf_log_bridge.c

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * (C) 2014 by Pablo Neira Ayuso <pablo@netfilter.org>

 */



#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/skbuff.h>

#include <linux/if_bridge.h>

#include <linux/ip.h>

#include <net/route.h>



#include <linux/netfilter.h>

#include <net/netfilter/nf_log.h>



static void nf_log_bridge_packet(struct net *net, u_int8_t pf,

				 unsigned int hooknum,

				 const struct sk_buff *skb,

				 const struct net_device *in,

				 const struct net_device *out,

				 const struct nf_loginfo *loginfo,

				 const char *prefix)

{

	nf_log_l2packet(net, pf, eth_hdr(skb)->h_proto, hooknum, skb,

			in, out, loginfo, prefix);

}



static struct nf_logger nf_bridge_logger __read_mostly = {

	.name		= "nf_log_bridge",

	.type		= NF_LOG_TYPE_LOG,

	.logfn		= nf_log_bridge_packet,

	.me		= THIS_MODULE,

};



static int __net_init nf_log_bridge_net_init(struct net *net)

{

	return nf_log_set(net, NFPROTO_BRIDGE, &nf_bridge_logger);

}



static void __net_exit nf_log_bridge_net_exit(struct net *net)

{

	nf_log_unset(net, &nf_bridge_logger);

}



static struct pernet_operations nf_log_bridge_net_ops = {

	.init = nf_log_bridge_net_init,

	.exit = nf_log_bridge_net_exit,

};



static int __init nf_log_bridge_init(void)

{

	int ret;



	/* Request to load the real packet loggers. */

	nf_logger_request_module(NFPROTO_IPV4, NF_LOG_TYPE_LOG);

	nf_logger_request_module(NFPROTO_IPV6, NF_LOG_TYPE_LOG);

	nf_logger_request_module(NFPROTO_ARP, NF_LOG_TYPE_LOG);



	ret = register_pernet_subsys(&nf_log_bridge_net_ops);

	if (ret < 0)

		return ret;



	nf_log_register(NFPROTO_BRIDGE, &nf_bridge_logger);

	return 0;

}



static void __exit nf_log_bridge_exit(void)

{

	unregister_pernet_subsys(&nf_log_bridge_net_ops);

	nf_log_unregister(&nf_bridge_logger);

}



module_init(nf_log_bridge_init);

module_exit(nf_log_bridge_exit);



MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");

MODULE_DESCRIPTION("Netfilter bridge packet logging");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NF_LOGGER(AF_BRIDGE, 0);

net/netfilter/nf_log.c

+0 −7
Original line number Diff line number Diff line
@@ -151,13 +151,6 @@ void nf_log_unbind_pf(struct net *net, u_int8_t pf) 
}

EXPORT_SYMBOL(nf_log_unbind_pf);



void nf_logger_request_module(int pf, enum nf_log_type type)

{

	if (loggers[pf][type] == NULL)

		request_module("nf-logger-%u-%u", pf, type);

}

EXPORT_SYMBOL_GPL(nf_logger_request_module);



int nf_logger_find_get(int pf, enum nf_log_type type)

{

	struct nf_logger *logger;