diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:09 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:09 -0400 |
commit | 84541cc13a3bb31a58c096dde3517461e3ad91c2 (patch) | |
tree | 625acaaed0adc4489714e7b9581fd5642f2af628 | |
parent | a5c3a8005cb7a36ebcc5b849f6045069ce4f7ca8 (diff) |
netfilter: netns nf_conntrack: H323 conntracking in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index dfb826c973d9..c1504f71cdff 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c | |||
@@ -1210,6 +1210,7 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct, | |||
1210 | union nf_inet_addr *addr, | 1210 | union nf_inet_addr *addr, |
1211 | __be16 port) | 1211 | __be16 port) |
1212 | { | 1212 | { |
1213 | struct net *net = nf_ct_net(ct); | ||
1213 | struct nf_conntrack_expect *exp; | 1214 | struct nf_conntrack_expect *exp; |
1214 | struct nf_conntrack_tuple tuple; | 1215 | struct nf_conntrack_tuple tuple; |
1215 | 1216 | ||
@@ -1219,7 +1220,7 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct, | |||
1219 | tuple.dst.u.tcp.port = port; | 1220 | tuple.dst.u.tcp.port = port; |
1220 | tuple.dst.protonum = IPPROTO_TCP; | 1221 | tuple.dst.protonum = IPPROTO_TCP; |
1221 | 1222 | ||
1222 | exp = __nf_ct_expect_find(&init_net, &tuple); | 1223 | exp = __nf_ct_expect_find(net, &tuple); |
1223 | if (exp && exp->master == ct) | 1224 | if (exp && exp->master == ct) |
1224 | return exp; | 1225 | return exp; |
1225 | return NULL; | 1226 | return NULL; |