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

Commit e7bfd0a1 authored by Peter Warasin's avatar Peter Warasin Committed by Patrick McHardy
Browse files

[NETFILTER]: bridge: add ebt_nflog watcher 



This patch adds the ebtables nflog watcher to the kernel in order to
allow ebtables log through the nfnetlink_log backend.

Signed-off-by: default avatarPeter Warasin <peter@endian.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 3c9fba65

include/linux/netfilter_bridge/ebt_nflog.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_BRIDGE_EBT_NFLOG_H

#define __LINUX_BRIDGE_EBT_NFLOG_H



#define EBT_NFLOG_MASK 0x0



#define EBT_NFLOG_PREFIX_SIZE 64

#define EBT_NFLOG_WATCHER "nflog"



#define EBT_NFLOG_DEFAULT_GROUP		0x1

#define EBT_NFLOG_DEFAULT_THRESHOLD	1



struct ebt_nflog_info {

	u_int32_t len;

	u_int16_t group;

	u_int16_t threshold;

	u_int16_t flags;

	u_int16_t pad;

	char prefix[EBT_NFLOG_PREFIX_SIZE];

};



#endif				/* __LINUX_BRIDGE_EBT_NFLOG_H */

net/bridge/netfilter/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -212,4 +212,18 @@ config BRIDGE_EBT_ULOG 


	  To compile it as a module, choose M here.  If unsure, say N.



config BRIDGE_EBT_NFLOG

	tristate "ebt: nflog support"

	depends on BRIDGE_NF_EBTABLES

	help

	  This option enables the nflog watcher, which allows to LOG

	  messages through the netfilter logging API, which can use

	  either the old LOG target, the old ULOG target or nfnetlink_log

	  as backend.



	  This option adds the ulog watcher, that you can use in any rule

	  in any ebtables table.



	  To compile it as a module, choose M here.  If unsure, say N.



endmenu

net/bridge/netfilter/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o 
# watchers

obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o

obj-$(CONFIG_BRIDGE_EBT_ULOG) += ebt_ulog.o

obj-$(CONFIG_BRIDGE_EBT_NFLOG) += ebt_nflog.o

net/bridge/netfilter/ebt_nflog.c

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * ebt_nflog

 *

 *	Author:

 *	Peter Warasin <peter@endian.com>

 *

 *  February, 2008

 *

 * Based on:

 *  xt_NFLOG.c, (C) 2006 by Patrick McHardy <kaber@trash.net>

 *  ebt_ulog.c, (C) 2004 by Bart De Schuymer <bdschuym@pandora.be>

 *

 */



#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/netfilter_bridge/ebtables.h>

#include <linux/netfilter_bridge/ebt_nflog.h>

#include <net/netfilter/nf_log.h>



static void ebt_nflog(const struct sk_buff *skb,

		      unsigned int hooknr,

		      const struct net_device *in,

		      const struct net_device *out,

		      const void *data, unsigned int datalen)

{

	struct ebt_nflog_info *info = (struct ebt_nflog_info *)data;

	struct nf_loginfo li;



	li.type = NF_LOG_TYPE_ULOG;

	li.u.ulog.copy_len = info->len;

	li.u.ulog.group = info->group;

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



	nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, "%s", info->prefix);

}



static int ebt_nflog_check(const char *tablename,

			   unsigned int hookmask,

			   const struct ebt_entry *e,

			   void *data, unsigned int datalen)

{

	struct ebt_nflog_info *info = (struct ebt_nflog_info *)data;



	if (datalen != EBT_ALIGN(sizeof(struct ebt_nflog_info)))

		return -EINVAL;

	if (info->flags & ~EBT_NFLOG_MASK)

		return -EINVAL;

	info->prefix[EBT_NFLOG_PREFIX_SIZE - 1] = '\0';

	return 0;

}



static struct ebt_watcher nflog __read_mostly = {

	.name = EBT_NFLOG_WATCHER,

	.watcher = ebt_nflog,

	.check = ebt_nflog_check,

	.me = THIS_MODULE,

};



static int __init ebt_nflog_init(void)

{

	return ebt_register_watcher(&nflog);

}



static void __exit ebt_nflog_fini(void)

{

	ebt_unregister_watcher(&nflog);

}



module_init(ebt_nflog_init);

module_exit(ebt_nflog_fini);

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Peter Warasin <peter@endian.com>");

MODULE_DESCRIPTION("ebtables NFLOG netfilter logging module");