]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
netfilter: Fix SIP conntrack build with NAT disabled.
authorPatrick McHardy <kaber@trash.net>
Sun, 20 Apr 2008 00:53:52 +0000 (17:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Apr 2008 00:53:52 +0000 (17:53 -0700)
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>
net/netfilter/nf_conntrack_sip.c

index 65b3ba57a3b7b639fef7c9850afe236bd4a0af53..9f4900069561547772d04ca232f36f720605fcee 100644 (file)
@@ -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();