Commit 6939c33a authored by Richard Weinberger's avatar Richard Weinberger Committed by Pablo Neira Ayuso
Browse files

netfilter: merge ipt_LOG and ip6_LOG into xt_LOG 



ipt_LOG and ip6_LOG have a lot of common code, merge them
to reduce duplicate code.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 544d5c7d

include/linux/netfilter/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ header-y += xt_CT.h 
header-y += xt_DSCP.h

header-y += xt_IDLETIMER.h

header-y += xt_LED.h

header-y += xt_LOG.h

header-y += xt_MARK.h

header-y += xt_nfacct.h

header-y += xt_NFLOG.h

include/linux/netfilter/xt_LOG.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef _XT_LOG_H

#define _XT_LOG_H



/* make sure not to change this without changing nf_log.h:NF_LOG_* (!) */

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

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

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

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

#define XT_LOG_NFLOG		0x10	/* Unsupported, don't reuse */

#define XT_LOG_MACDECODE	0x20	/* Decode MAC header */

#define XT_LOG_MASK		0x2f



struct xt_log_info {

	unsigned char level;

	unsigned char logflags;

	char prefix[30];

};



#endif /* _XT_LOG_H */

include/linux/netfilter_ipv4/ipt_LOG.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _IPT_LOG_H

#define _IPT_LOG_H



#warning "Please update iptables, this file will be removed soon!"



/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */

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

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

include/linux/netfilter_ipv6/ip6t_LOG.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _IP6T_LOG_H

#define _IP6T_LOG_H



#warning "Please update iptables, this file will be removed soon!"



/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */

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

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

net/ipv4/netfilter/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -123,15 +123,6 @@ config IP_NF_TARGET_REJECT 


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



config IP_NF_TARGET_LOG

	tristate "LOG target support"

	default m if NETFILTER_ADVANCED=n

	help

	  This option adds a `LOG' target, which allows you to create rules in

	  any iptables table which records the packet header to the syslog.



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



config IP_NF_TARGET_ULOG

	tristate "ULOG target support"

	default m if NETFILTER_ADVANCED=n