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

Commit de81bbea authored by Florian Westphal's avatar Florian Westphal Committed by Patrick McHardy
Browse files

netfilter: ipt_addrtype: rename to xt_addrtype 



Followup patch will add ipv6 support.

ipt_addrtype.h is retained for compatibility reasons, but no longer used
by the kernel.

Signed-off-by: default avatarFlorian Westphal <fwestphal@astaro.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 6a8ab060

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -618,3 +618,11 @@ Who: Jan Engelhardt <jengelh@medozas.de> 
Files:	net/netfilter/xt_connlimit.c



----------------------------



What:	ipt_addrtype match include file

When:	2012

Why:	superseded by xt_addrtype

Who:	Florian Westphal <fw@strlen.de>

Files:	include/linux/netfilter_ipv4/ipt_addrtype.h



----------------------------

include/linux/netfilter/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ header-y += xt_TCPMSS.h 
header-y += xt_TCPOPTSTRIP.h

header-y += xt_TEE.h

header-y += xt_TPROXY.h

header-y += xt_addrtype.h

header-y += xt_cluster.h

header-y += xt_comment.h

header-y += xt_connbytes.h

include/linux/netfilter/xt_addrtype.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef _XT_ADDRTYPE_H

#define _XT_ADDRTYPE_H



#include <linux/types.h>



enum {

	XT_ADDRTYPE_INVERT_SOURCE	= 0x0001,

	XT_ADDRTYPE_INVERT_DEST		= 0x0002,

	XT_ADDRTYPE_LIMIT_IFACE_IN	= 0x0004,

	XT_ADDRTYPE_LIMIT_IFACE_OUT	= 0x0008,

};



struct xt_addrtype_info_v1 {

	__u16	source;		/* source-type mask */

	__u16	dest;		/* dest-type mask */

	__u32	flags;

};



/* revision 0 */

struct xt_addrtype_info {

	__u16	source;		/* source-type mask */

	__u16	dest;		/* dest-type mask */

	__u32	invert_source;

	__u32	invert_dest;

};



#endif

net/ipv4/netfilter/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -64,16 +64,6 @@ config IP_NF_IPTABLES 
if IP_NF_IPTABLES



# The matches.

config IP_NF_MATCH_ADDRTYPE

	tristate '"addrtype" address type match support'

	depends on NETFILTER_ADVANCED

	help

	  This option allows you to match what routing thinks of an address,

	  eg. UNICAST, LOCAL, BROADCAST, ...



	  If you want to compile it as a module, say M here and read

	  <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.



config IP_NF_MATCH_AH

	tristate '"ah" match support'

	depends on NETFILTER_ADVANCED

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o 
obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.o



# matches

obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o

obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o