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

Commit f72e25a8 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[NETFILTER]: Rename ipt_iprange to xt_iprange 



This patch moves ipt_iprange to xt_iprange, in preparation for adding
IPv6 support to xt_iprange.

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ae15b64

include/linux/netfilter/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ header-y += xt_dccp.h 
header-y += xt_dscp.h

header-y += xt_esp.h

header-y += xt_hashlimit.h

header-y += xt_iprange.h

header-y += xt_helper.h

header-y += xt_length.h

header-y += xt_limit.h

include/linux/netfilter/xt_iprange.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_NETFILTER_XT_IPRANGE_H

#define _LINUX_NETFILTER_XT_IPRANGE_H 1



enum {

	IPRANGE_SRC     = 1 << 0,	/* match source IP address */

	IPRANGE_DST     = 1 << 1,	/* match destination IP address */

	IPRANGE_SRC_INV = 1 << 4,	/* negate the condition */

	IPRANGE_DST_INV = 1 << 5,	/* -"- */

};



struct xt_iprange_mtinfo {

	union nf_inet_addr src_min, src_max;

	union nf_inet_addr dst_min, dst_max;

	u_int8_t flags;

};



#endif /* _LINUX_NETFILTER_XT_IPRANGE_H */

include/linux/netfilter_ipv4/ipt_iprange.h

+1 −5
Original line number Diff line number Diff line
@@ -2,11 +2,7 @@ 
#define _IPT_IPRANGE_H



#include <linux/types.h>



#define IPRANGE_SRC		0x01	/* Match source IP address */

#define IPRANGE_DST		0x02	/* Match destination IP address */

#define IPRANGE_SRC_INV		0x10	/* Negate the condition */

#define IPRANGE_DST_INV		0x20	/* Negate the condition */

#include <linux/netfilter/xt_iprange.h>



struct ipt_iprange {

	/* Inclusive: network order. */

net/ipv4/netfilter/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -57,16 +57,6 @@ config IP_NF_IPTABLES 
	  To compile it as a module, choose M here.  If unsure, say N.



# The matches.

config IP_NF_MATCH_IPRANGE

	tristate '"iprange" match support'

	depends on IP_NF_IPTABLES

	depends on NETFILTER_ADVANCED

	help

	  This option makes possible to match IP addresses against IP address

	  ranges.



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



config IP_NF_MATCH_RECENT

	tristate '"recent" match support'

	depends on IP_NF_IPTABLES

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o 
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

obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o

obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o

obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o