xt_connlimit: netns support
Subsystems (2)
PATCH 1/1 xt_connlimit: netns support
Signed-off-by Alexey Dobriyan <[email protected]>
---
net/netfilter/xt_connlimit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/netfilter/xt_connlimit.c +5 -3
@@ -99,7 +99,8 @@ same_source_net(const union nf_inet_addr *addr, } } -static int count_them(struct xt_connlimit_data *data, +static int count_them(struct net *net, + struct xt_connlimit_data *data, const struct nf_conntrack_tuple *tuple, const union nf_inet_addr *addr, const union nf_inet_addr *mask,
@@ -122,7 +123,7 @@ static int count_them(struct xt_connlimit_data *data,/* check the saved connections */ list_for_each_entry_safe (conn, tmp, hash, list) { - found =nf_conntrack_find_get (&init_net, &conn->tuple); + found =nf_conntrack_find_get (net, &conn->tuple); found_ct =NULL ;if (found !=NULL )
@@ -180,6 +181,7 @@ static int count_them(struct xt_connlimit_data *data,static bool connlimit_mt (const struct sk_buff *skb,const struct xt_match_param *par) { +struct net *net =dev_net (par->in ? par->in : par->out);const struct xt_connlimit_info *info = par->matchinfo;union nf_inet_addr addr;struct nf_conntrack_tuple tuple;
@@ -204,7 +206,7 @@ connlimit_mt(const struct sk_buff *skb, const struct xt_match_param *par) }spin_lock_bh (&info->data->lock); - connections =count_them (info->data, tuple_ptr, &addr, + connections =count_them (net, info->data, tuple_ptr, &addr, &info->mask, par->family);spin_unlock_bh (&info->data->lock);
Patrick McHardy
AppliedAlexey Dobriyan wrote:
Applied, thanks.
Patrick McHardy
AppliedAlexey Dobriyan wrote:
Applied, thanks.