Commit f01ffbd6 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_log: move logging stuff to seperate header 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc01dcbd

include/linux/netfilter.h

+0 −55
Original line number Diff line number Diff line
@@ -124,61 +124,6 @@ extern struct ctl_table nf_net_ipv4_netfilter_sysctl_path[]; 


extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];



/* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will

 * disappear once iptables is replaced with pkttables.  Please DO NOT use them

 * for any new code! */

#define NF_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define NF_LOG_TCPOPT		0x02	/* Log TCP options */

#define NF_LOG_IPOPT		0x04	/* Log IP options */

#define NF_LOG_UID		0x08	/* Log UID owning local socket */

#define NF_LOG_MASK		0x0f



#define NF_LOG_TYPE_LOG		0x01

#define NF_LOG_TYPE_ULOG	0x02



struct nf_loginfo {

	u_int8_t type;

	union {

		struct {

			u_int32_t copy_len;

			u_int16_t group;

			u_int16_t qthreshold;

		} ulog;

		struct {

			u_int8_t level;

			u_int8_t logflags;

		} log;

	} u;

};



typedef void nf_logfn(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,

		      const char *prefix);



struct nf_logger {

	struct module	*me;

	nf_logfn 	*logfn;

	char		*name;

};



/* 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);



/* Calls the registered backend logging function */

void nf_log_packet(int pf,

		   unsigned int hooknum,

		   const struct sk_buff *skb,

		   const struct net_device *in,

		   const struct net_device *out,

		   struct nf_loginfo *li,

		   const char *fmt, ...);



int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,

		 struct net_device *indev, struct net_device *outdev,

		 int (*okfn)(struct sk_buff *), int thresh);

include/net/netfilter/nf_log.h

0 → 100644
+59 −0
Original line number Diff line number Diff line 
#ifndef _NF_LOG_H

#define _NF_LOG_H



/* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will

 * disappear once iptables is replaced with pkttables.  Please DO NOT use them

 * for any new code! */

#define NF_LOG_TCPSEQ		0x01	/* Log TCP sequence numbers */

#define NF_LOG_TCPOPT		0x02	/* Log TCP options */

#define NF_LOG_IPOPT		0x04	/* Log IP options */

#define NF_LOG_UID		0x08	/* Log UID owning local socket */

#define NF_LOG_MASK		0x0f



#define NF_LOG_TYPE_LOG		0x01

#define NF_LOG_TYPE_ULOG	0x02



struct nf_loginfo {

	u_int8_t type;

	union {

		struct {

			u_int32_t copy_len;

			u_int16_t group;

			u_int16_t qthreshold;

		} ulog;

		struct {

			u_int8_t level;

			u_int8_t logflags;

		} log;

	} u;

};



typedef void nf_logfn(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,

		      const char *prefix);



struct nf_logger {

	struct module	*me;

	nf_logfn 	*logfn;

	char		*name;

};



/* 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);



/* Calls the registered backend logging function */

void nf_log_packet(int pf,

		   unsigned int hooknum,

		   const struct sk_buff *skb,

		   const struct net_device *in,

		   const struct net_device *out,

		   struct nf_loginfo *li,

		   const char *fmt, ...);



#endif /* _NF_LOG_H */

net/bridge/netfilter/ebt_log.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/in.h>

#include <linux/if_arp.h>

#include <linux/spinlock.h>

#include <net/netfilter/nf_log.h>



static DEFINE_SPINLOCK(ebt_log_lock);

net/bridge/netfilter/ebt_ulog.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/netdevice.h>

#include <linux/netfilter_bridge/ebtables.h>

#include <linux/netfilter_bridge/ebt_ulog.h>

#include <net/netfilter/nf_log.h>

#include <net/sock.h>

#include "../br_private.h"

net/ipv4/netfilter/ip_tables.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <linux/netfilter/x_tables.h>

#include <linux/netfilter_ipv4/ip_tables.h>

#include <net/netfilter/nf_log.h>



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");