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

Commit e948b20a authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: rename ipt_recent to xt_recent 



Like with other modules (such as ipt_state), ipt_recent.h is changed
to forward definitions to (IOW include) xt_recent.h, and xt_recent.c
is changed to use the new constant names.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 76108cea

include/linux/netfilter/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ header-y += xt_owner.h 
header-y += xt_pkttype.h

header-y += xt_rateest.h

header-y += xt_realm.h

header-y += xt_recent.h

header-y += xt_sctp.h

header-y += xt_state.h

header-y += xt_statistic.h

include/linux/netfilter/xt_recent.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_NETFILTER_XT_RECENT_H

#define _LINUX_NETFILTER_XT_RECENT_H 1



enum {

	XT_RECENT_CHECK    = 1 << 0,

	XT_RECENT_SET      = 1 << 1,

	XT_RECENT_UPDATE   = 1 << 2,

	XT_RECENT_REMOVE   = 1 << 3,

	XT_RECENT_TTL      = 1 << 4,



	XT_RECENT_SOURCE   = 0,

	XT_RECENT_DEST     = 1,



	XT_RECENT_NAME_LEN = 200,

};



struct xt_recent_mtinfo {

	u_int32_t seconds;

	u_int32_t hit_count;

	u_int8_t check_set;

	u_int8_t invert;

	char name[XT_RECENT_NAME_LEN];

	u_int8_t side;

};



#endif /* _LINUX_NETFILTER_XT_RECENT_H */

include/linux/netfilter_ipv4/ipt_recent.h

+11 −17
Original line number Diff line number Diff line 
#ifndef _IPT_RECENT_H

#define _IPT_RECENT_H



#define RECENT_NAME	"ipt_recent"

#define RECENT_VER	"v0.3.1"

#include <linux/netfilter/xt_recent.h>



#define IPT_RECENT_CHECK  1

#define IPT_RECENT_SET    2

#define IPT_RECENT_UPDATE 4

#define IPT_RECENT_REMOVE 8

#define IPT_RECENT_TTL   16

#define ipt_recent_info xt_recent_mtinfo



#define IPT_RECENT_SOURCE 0

#define IPT_RECENT_DEST   1

enum {

	IPT_RECENT_CHECK    = XT_RECENT_CHECK,

	IPT_RECENT_SET      = XT_RECENT_SET,

	IPT_RECENT_UPDATE   = XT_RECENT_UPDATE,

	IPT_RECENT_REMOVE   = XT_RECENT_REMOVE,

	IPT_RECENT_TTL      = XT_RECENT_TTL,



#define IPT_RECENT_NAME_LEN 200

	IPT_RECENT_SOURCE   = XT_RECENT_SOURCE,

	IPT_RECENT_DEST     = XT_RECENT_DEST,



struct ipt_recent_info {

	u_int32_t   seconds;

	u_int32_t   hit_count;

	u_int8_t    check_set;

	u_int8_t    invert;

	char        name[IPT_RECENT_NAME_LEN];

	u_int8_t    side;

	IPT_RECENT_NAME_LEN = XT_RECENT_NAME_LEN,

};



#endif /*_IPT_RECENT_H*/

net/ipv4/netfilter/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -57,19 +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_RECENT

	tristate '"recent" match support'

	depends on IP_NF_IPTABLES

	depends on NETFILTER_ADVANCED

	help

	  This match is used for creating one or many lists of recently

	  used addresses and then matching against that/those list(s).



	  Short options are available by using 'iptables -m recent -h'

	  Official Website: <http://snowman.net/projects/ipt_recent/>



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



config IP_NF_MATCH_ECN

	tristate '"ecn" match support'

	depends on IP_NF_IPTABLES

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.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_RECENT) += ipt_recent.o

obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o



# targets