mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[NETFILTER]: xt_connlimit: use the new union nf_inet_addr 

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Engelhardt 2007-12-17 22:44:47 -08:00 committed by David S. Miller
parent e79ec50b95
commit 22c2d8bca2
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/netfilter/xt_connlimit.h
View File

@ -5,8 +5,13 @@ struct xt_connlimit_data;
struct xt_connlimit_info {
union {
__be32 v4_mask;
__be32 v6_mask[4];
union nf_inet_addr mask;
#ifndef __KERNEL__
union {
__be32 v4_mask;
__be32 v6_mask[4];
};
#endif
};
unsigned int limit, inverse;

7
net/netfilter/xt_connlimit.c
View File

@ -185,7 +185,7 @@ connlimit_mt(const struct sk_buff *skb, const struct net_device *in,
bool *hotdrop)
{
const struct xt_connlimit_info *info = matchinfo;
union nf_inet_addr addr, mask;
union nf_inet_addr addr;
struct nf_conntrack_tuple tuple;
const struct nf_conntrack_tuple *tuple_ptr = &tuple;
enum ip_conntrack_info ctinfo;
@ -202,15 +202,14 @@ connlimit_mt(const struct sk_buff *skb, const struct net_device *in,
if (match->family == AF_INET6) {
const struct ipv6hdr *iph = ipv6_hdr(skb);
memcpy(&addr.ip6, &iph->saddr, sizeof(iph->saddr));
memcpy(&mask.ip6, info->v6_mask, sizeof(info->v6_mask));
} else {
const struct iphdr *iph = ip_hdr(skb);
addr.ip = iph->saddr;
mask.ip = info->v4_mask;
}
spin_lock_bh(&info->data->lock);
connections = count_them(info->data, tuple_ptr, &addr, &mask, match);
connections = count_them(info->data, tuple_ptr, &addr,
&info->mask, match);
spin_unlock_bh(&info->data->lock);
if (connections < 0) {