hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Jan Engelhardt 2008-10-08 11:35:00 +02:00 committed by Patrick McHardy
parent 76108cea06
commit e948b20a71
8 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/netfilter/Kbuild
View File

@ -32,6 +32,7 @@ header-y += xt_owner.h
header-y += xt_pkttype.h header-y += xt_pkttype.h
header-y += xt_rateest.h header-y += xt_rateest.h
header-y += xt_realm.h header-y += xt_realm.h
header-y += xt_recent.h
header-y += xt_sctp.h header-y += xt_sctp.h
header-y += xt_state.h header-y += xt_state.h
header-y += xt_statistic.h header-y += xt_statistic.h

26
include/linux/netfilter/xt_recent.h Normal file
View File

@ -0,0 +1,26 @@
#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 */

28
include/linux/netfilter_ipv4/ipt_recent.h
View File

@ -1,27 +1,21 @@
#ifndef _IPT_RECENT_H #ifndef _IPT_RECENT_H
#define _IPT_RECENT_H #define _IPT_RECENT_H
#define RECENT_NAME "ipt_recent" #include <linux/netfilter/xt_recent.h>
#define RECENT_VER "v0.3.1"
#define IPT_RECENT_CHECK 1 #define ipt_recent_info xt_recent_mtinfo
#define IPT_RECENT_SET 2
#define IPT_RECENT_UPDATE 4
#define IPT_RECENT_REMOVE 8
#define IPT_RECENT_TTL 16
#define IPT_RECENT_SOURCE 0 enum {
#define IPT_RECENT_DEST 1 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 { IPT_RECENT_NAME_LEN = XT_RECENT_NAME_LEN,
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;
}; };
#endif /*_IPT_RECENT_H*/ #endif /*_IPT_RECENT_H*/

13
net/ipv4/netfilter/Kconfig
View File

@ -57,19 +57,6 @@ config IP_NF_IPTABLES
To compile it as a module, choose M here. If unsure, say N. To compile it as a module, choose M here. If unsure, say N.
# The matches. # 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 config IP_NF_MATCH_ECN
tristate '"ecn" match support' tristate '"ecn" match support'
depends on IP_NF_IPTABLES depends on IP_NF_IPTABLES

1
net/ipv4/netfilter/Makefile
View File

@ -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_ADDRTYPE) += ipt_addrtype.o
obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.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 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
# targets # targets

11
net/netfilter/Kconfig
View File

@ -732,6 +732,17 @@ config NETFILTER_XT_MATCH_REALM
If you want to compile it as a module, say M here and read If you want to compile it as a module, say M here and read
<file:Documentation/kbuild/modules.txt>. If unsure, say `N'. <file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
config NETFILTER_XT_MATCH_RECENT
tristate '"recent" match support'
depends on NETFILTER_XTABLES
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/>
config NETFILTER_XT_MATCH_SCTP config NETFILTER_XT_MATCH_SCTP
tristate '"sctp" protocol match support (EXPERIMENTAL)' tristate '"sctp" protocol match support (EXPERIMENTAL)'
depends on NETFILTER_XTABLES && EXPERIMENTAL depends on NETFILTER_XTABLES && EXPERIMENTAL

1
net/netfilter/Makefile
View File

@ -76,6 +76,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_POLICY) += xt_policy.o
obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) += xt_quota.o obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) += xt_quota.o
obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST) += xt_rateest.o obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST) += xt_rateest.o
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) += xt_recent.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o

37
net/ipv4/netfilter/ipt_recent.c → net/netfilter/xt_recent.c
View File

@ -27,11 +27,12 @@
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv4/ipt_recent.h> #include <linux/netfilter/xt_recent.h>
MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>"); MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
MODULE_DESCRIPTION("Xtables: \"recently-seen\" host matching for IPv4"); MODULE_DESCRIPTION("Xtables: \"recently-seen\" host matching for IPv4");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_recent");
static unsigned int ip_list_tot = 100; static unsigned int ip_list_tot = 100;
static unsigned int ip_pkt_list_tot = 20; static unsigned int ip_pkt_list_tot = 20;
@ -64,7 +65,7 @@ struct recent_entry {
struct recent_table { struct recent_table {
struct list_head list; struct list_head list;
char name[IPT_RECENT_NAME_LEN]; char name[XT_RECENT_NAME_LEN];
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc; struct proc_dir_entry *proc;
#endif #endif
@ -175,14 +176,14 @@ recent_mt(const struct sk_buff *skb, const struct net_device *in,
const void *matchinfo, int offset, unsigned int protoff, const void *matchinfo, int offset, unsigned int protoff,
bool *hotdrop) bool *hotdrop)
{ {
const struct ipt_recent_info *info = matchinfo; const struct xt_recent_mtinfo *info = matchinfo;
struct recent_table *t; struct recent_table *t;
struct recent_entry *e; struct recent_entry *e;
__be32 addr; __be32 addr;
u_int8_t ttl; u_int8_t ttl;
bool ret = info->invert; bool ret = info->invert;
if (info->side == IPT_RECENT_DEST) if (info->side == XT_RECENT_DEST)
addr = ip_hdr(skb)->daddr; addr = ip_hdr(skb)->daddr;
else else
addr = ip_hdr(skb)->saddr; addr = ip_hdr(skb)->saddr;
@ -195,9 +196,9 @@ recent_mt(const struct sk_buff *skb, const struct net_device *in,
spin_lock_bh(&recent_lock); spin_lock_bh(&recent_lock);
t = recent_table_lookup(info->name); t = recent_table_lookup(info->name);
e = recent_entry_lookup(t, addr, e = recent_entry_lookup(t, addr,
info->check_set & IPT_RECENT_TTL ? ttl : 0); info->check_set & XT_RECENT_TTL ? ttl : 0);
if (e == NULL) { if (e == NULL) {
if (!(info->check_set & IPT_RECENT_SET)) if (!(info->check_set & XT_RECENT_SET))
goto out; goto out;
e = recent_entry_init(t, addr, ttl); e = recent_entry_init(t, addr, ttl);
if (e == NULL) if (e == NULL)
@ -206,12 +207,12 @@ recent_mt(const struct sk_buff *skb, const struct net_device *in,
goto out; goto out;
} }
if (info->check_set & IPT_RECENT_SET) if (info->check_set & XT_RECENT_SET)
ret = !ret; ret = !ret;
else if (info->check_set & IPT_RECENT_REMOVE) { else if (info->check_set & XT_RECENT_REMOVE) {
recent_entry_remove(t, e); recent_entry_remove(t, e);
ret = !ret; ret = !ret;
} else if (info->check_set & (IPT_RECENT_CHECK | IPT_RECENT_UPDATE)) { } else if (info->check_set & (XT_RECENT_CHECK | XT_RECENT_UPDATE)) {
unsigned long time = jiffies - info->seconds * HZ; unsigned long time = jiffies - info->seconds * HZ;
unsigned int i, hits = 0; unsigned int i, hits = 0;
@ -225,8 +226,8 @@ recent_mt(const struct sk_buff *skb, const struct net_device *in,
} }
} }
if (info->check_set & IPT_RECENT_SET || if (info->check_set & XT_RECENT_SET ||
(info->check_set & IPT_RECENT_UPDATE && ret)) { (info->check_set & XT_RECENT_UPDATE && ret)) {
recent_entry_update(t, e); recent_entry_update(t, e);
e->ttl = ttl; e->ttl = ttl;
} }
@ -240,22 +241,22 @@ recent_mt_check(const char *tablename, const void *ip,
const struct xt_match *match, void *matchinfo, const struct xt_match *match, void *matchinfo,
unsigned int hook_mask) unsigned int hook_mask)
{ {
const struct ipt_recent_info *info = matchinfo; const struct xt_recent_mtinfo *info = matchinfo;
struct recent_table *t; struct recent_table *t;
unsigned i; unsigned i;
bool ret = false; bool ret = false;
if (hweight8(info->check_set & if (hweight8(info->check_set &
(IPT_RECENT_SET | IPT_RECENT_REMOVE | (XT_RECENT_SET | XT_RECENT_REMOVE |
IPT_RECENT_CHECK | IPT_RECENT_UPDATE)) != 1) XT_RECENT_CHECK | XT_RECENT_UPDATE)) != 1)
return false; return false;
if ((info->check_set & (IPT_RECENT_SET | IPT_RECENT_REMOVE)) && if ((info->check_set & (XT_RECENT_SET | XT_RECENT_REMOVE)) &&
(info->seconds || info->hit_count)) (info->seconds || info->hit_count))
return false; return false;
if (info->hit_count > ip_pkt_list_tot) if (info->hit_count > ip_pkt_list_tot)
return false; return false;
if (info->name[0] == '\0' || if (info->name[0] == '\0' ||
strnlen(info->name, IPT_RECENT_NAME_LEN) == IPT_RECENT_NAME_LEN) strnlen(info->name, XT_RECENT_NAME_LEN) == XT_RECENT_NAME_LEN)
return false; return false;
mutex_lock(&recent_mutex); mutex_lock(&recent_mutex);
@ -296,7 +297,7 @@ out:
static void recent_mt_destroy(const struct xt_match *match, void *matchinfo) static void recent_mt_destroy(const struct xt_match *match, void *matchinfo)
{ {
const struct ipt_recent_info *info = matchinfo; const struct xt_recent_mtinfo *info = matchinfo;
struct recent_table *t; struct recent_table *t;
mutex_lock(&recent_mutex); mutex_lock(&recent_mutex);
@ -461,7 +462,7 @@ static struct xt_match recent_mt_reg __read_mostly = {
.name = "recent", .name = "recent",
.family = AF_INET, .family = AF_INET,
.match = recent_mt, .match = recent_mt,
.matchsize = sizeof(struct ipt_recent_info), .matchsize = sizeof(struct xt_recent_mtinfo),
.checkentry = recent_mt_check, .checkentry = recent_mt_check,
.destroy = recent_mt_destroy, .destroy = recent_mt_destroy,
.me = THIS_MODULE, .me = THIS_MODULE,