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 | a5c3a8005cb7a36ebcc5b849f6045069ce4f7ca8 (patch) | |
tree | f03b5640ae1c0008d23021f552a65762aaed56d8 /net/netfilter | |
parent | 08f6547d266fdba087f7fa7963fc0610be5b7cd7 (diff) |
netfilter: netns nf_conntrack: SIP conntracking in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index a006080eb389..6813f1c8863f 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c | |||
@@ -736,6 +736,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, | |||
736 | struct nf_conntrack_expect *exp, *rtp_exp, *rtcp_exp; | 736 | struct nf_conntrack_expect *exp, *rtp_exp, *rtcp_exp; |
737 | enum ip_conntrack_info ctinfo; | 737 | enum ip_conntrack_info ctinfo; |
738 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); | 738 | struct nf_conn *ct = nf_ct_get(skb, &ctinfo); |
739 | struct net *net = nf_ct_net(ct); | ||
739 | enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); | 740 | enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); |
740 | union nf_inet_addr *saddr; | 741 | union nf_inet_addr *saddr; |
741 | struct nf_conntrack_tuple tuple; | 742 | struct nf_conntrack_tuple tuple; |
@@ -775,7 +776,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, | |||
775 | 776 | ||
776 | rcu_read_lock(); | 777 | rcu_read_lock(); |
777 | do { | 778 | do { |
778 | exp = __nf_ct_expect_find(&init_net, &tuple); | 779 | exp = __nf_ct_expect_find(net, &tuple); |
779 | 780 | ||
780 | if (!exp || exp->master == ct || | 781 | if (!exp || exp->master == ct || |
781 | nfct_help(exp->master)->helper != nfct_help(ct)->helper || | 782 | nfct_help(exp->master)->helper != nfct_help(ct)->helper || |