Skip to content

Commit

Permalink
Revert "netfilter: xt_connlimit: connlimit-above early loop termination"
Browse files Browse the repository at this point in the history
This reverts commit 44bd4de.

I have to revert the early loop termination in connlimit since it generates
problems when an iptables statement does not use -m state --state NEW before
the connlimit match extension.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
  • Loading branch information
Stefan Berger authored and Patrick McHardy committed Feb 14, 2011
1 parent d846f71 commit 20b7975
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions net/netfilter/xt_connlimit.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ static int count_them(struct net *net,
const struct nf_conntrack_tuple *tuple,
const union nf_inet_addr *addr,
const union nf_inet_addr *mask,
u_int8_t family,
unsigned int threshold)
u_int8_t family)
{
const struct nf_conntrack_tuple_hash *found;
struct xt_connlimit_conn *conn;
Expand Down Expand Up @@ -152,14 +151,9 @@ static int count_them(struct net *net,
continue;
}

if (same_source_net(addr, mask, &conn->tuple.src.u3, family)) {
if (same_source_net(addr, mask, &conn->tuple.src.u3, family))
/* same source network -> be counted! */
++matches;
if (matches > threshold) {
nf_ct_put(found_ct);
break;
}
}
nf_ct_put(found_ct);
}

Expand Down Expand Up @@ -213,8 +207,7 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)

spin_lock_bh(&info->data->lock);
connections = count_them(net, info->data, tuple_ptr, &addr,
&info->mask, par->family,
info->limit);
&info->mask, par->family);
spin_unlock_bh(&info->data->lock);

if (connections < 0)
Expand Down

0 comments on commit 20b7975

Please sign in to comment.