From 5fd9596f80af34c0aa0638ed409adea237a57b92 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 19 Apr 2008 17:53:52 -0700 Subject: [PATCH] --- yaml --- r: 91369 b: refs/heads/master c: e1f9a464026011b3f7d0f7b6dfab3e562e870a46 h: refs/heads/master i: 91367: b09029e199e5eca02d420be08eb036335b6da7b3 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_sip.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4eba068d97cc..09e016684fe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e9d8a70e4a48e146a0eaaa5a666f0a4889d873d +refs/heads/master: e1f9a464026011b3f7d0f7b6dfab3e562e870a46 diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c index 65b3ba57a3b7..9f4900069561 100644 --- a/trunk/net/netfilter/nf_conntrack_sip.c +++ b/trunk/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();