diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-04-19 17:53:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-19 17:53:52 -0700 |
| commit | e1f9a464026011b3f7d0f7b6dfab3e562e870a46 (patch) | |
| tree | 48cb0d536b0a751a5c3d6296979270739b254a85 /net | |
| parent | 4e9d8a70e4a48e146a0eaaa5a666f0a4889d873d (diff) | |
| download | op-kernel-dev-e1f9a464026011b3f7d0f7b6dfab3e562e870a46.zip op-kernel-dev-e1f9a464026011b3f7d0f7b6dfab3e562e870a46.tar.gz | |
netfilter: Fix SIP conntrack build with NAT disabled.
Reported by Ingo Molnar.
The SIP helper is also useful without NAT. This patch adds an ifdef
around the RTP call optimization for NATed clients.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 65b3ba5..9f49000 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -781,7 +781,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, nfct_help(exp->master)->helper != nfct_help(ct)->helper || exp->class != class) break; - +#ifdef CONFIG_NF_NAT_NEEDED if (exp->tuple.src.l3num == AF_INET && !direct_rtp && (exp->saved_ip != exp->tuple.dst.u3.ip || exp->saved_proto.udp.port != exp->tuple.dst.u.udp.port) && @@ -791,6 +791,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, tuple.dst.u.udp.port = exp->saved_proto.udp.port; direct_rtp = 1; } else +#endif skip_expect = 1; } while (!skip_expect); rcu_read_unlock(); |
