- add doc bcond

[packages/kernel.git] / kernel-nf_rtsp.patch

diff --git a/kernel-nf_rtsp.patch b/kernel-nf_rtsp.patch
index b500866c9912b814b30dda83d482caf6c0105dff..4655c9bac9452dd93f7cedcebaabb5efba52a5db 100644 (file)
--- a/kernel-nf_rtsp.patch
+++ b/kernel-nf_rtsp.patch
@@ -246,14 +246,8 @@ diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Kconfig linux-2.6.23-rc2/net
 diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile linux-2.6.23-rc2/net/ipv4/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile  2007-08-05 21:14:19.000000000 +0200
 +++ linux-2.6.23-rc2/net/ipv4/netfilter/Makefile       2007-08-05 10:53:55.000000000 +0200
-@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
- obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
- obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
- obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
- obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
- obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
- obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netfilter/Kconfig
 --- linux-2.6.23-rc2.orig/net/netfilter/Kconfig        2007-08-05 21:17:02.000000000 +0200
 +++ linux-2.6.23-rc2/net/netfilter/Kconfig     2007-08-05 11:04:59.000000000 +0200
@@ -271,20 +265,14 @@ diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netf
 +              If you want to compile it as a module, say 'M' here and read
 +              Documentation/modules.txt.  If unsure, say 'Y'.
 +
- config NF_CT_NETLINK
-       tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
-       depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK
+ config NF_CONNTRACK_MMS
+       tristate 'MMS protocol support'
+       depends on NF_CONNTRACK
 diff -purN linux-2.6.23-rc2.orig/net/netfilter/Makefile linux-2.6.23-rc2/net/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/netfilter/Makefile       2007-08-05 21:17:02.000000000 +0200
 +++ linux-2.6.23-rc2/net/netfilter/Makefile    2007-08-05 11:04:59.000000000 +0200
-@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
- obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
- obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
- obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
- 
- # generic X tables 
- obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 diff -purN linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h
 --- linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h  1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h       2007-11-10 17:16:36.000000000 +0100
@@ -807,7 +795,7 @@ diff -purN linux-2.6.24-rc1.orig/net/ipv4/netfilter/nf_nat_rtsp.c linux-2.6.24-r
 +    mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
 +    mr.range[0].min_ip = mr.range[0].max_ip = newip;
 +
-+    nf_nat_setup_info(ct, &mr.range[0], NF_IP_PRE_ROUTING);
++    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
 +}
 +
 +
@@ -845,10 +833,10 @@ diff -purN linux-2.6.24-rc1.orig/net/ipv4/netfilter/nf_nat_rtsp.c linux-2.6.24-r
 +
 +module_init(init);
 +module_exit(fini);
-diff -purN linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.24-rc1/net/netfilter/nf_conntrack_rtsp.c
---- linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24-rc1/net/netfilter/nf_conntrack_rtsp.c 2007-11-10 17:17:43.000000000 +0100
-@@ -0,0 +1,515 @@
+diff -purN linux-2.6.26.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.26/net/netfilter/nf_conntrack_rtsp.c
+--- linux-2.6.26.orig/net/netfilter/nf_conntrack_rtsp.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.26/net/netfilter/nf_conntrack_rtsp.c     2008-07-24 16:19:36.000000000 +0200
+@@ -0,0 +1,519 @@
 +/*
 + * RTSP extension for IP connection tracking
 + * (C) 2003 by Tom Marshall <tmarshall at real.com>
@@ -920,6 +908,8 @@ diff -purN linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.24-
 +static char *rtsp_buffer;
 +static DEFINE_SPINLOCK(rtsp_buffer_lock);
 +
++static struct nf_conntrack_expect_policy rtsp_exp_policy; 
++
 +unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
 +                               enum ip_conntrack_info ctinfo,
 +                               unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
@@ -1178,7 +1168,7 @@ diff -purN linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.24-
 +
 +              be_loport = htons(expinfo.loport);
 +
-+              nf_ct_expect_init(exp, ct->tuplehash[!dir].tuple.src.l3num,
++              nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
 +                      &ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3,
 +                      IPPROTO_UDP, NULL, &be_loport); 
 +
@@ -1315,6 +1305,9 @@ diff -purN linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.24-
 +              return -EBUSY;
 +      }
 +
++  rtsp_exp_policy.max_expected = max_outstanding;
++  rtsp_exp_policy.timeout = setup_timeout;
++      
 +      rtsp_buffer = kmalloc(65536, GFP_KERNEL);
 +      if (!rtsp_buffer) 
 +              return -ENOMEM;
@@ -1332,8 +1325,7 @@ diff -purN linux-2.6.24-rc1.orig/net/netfilter/nf_conntrack_rtsp.c linux-2.6.24-
 +              hlpr->tuple.dst.protonum = IPPROTO_TCP;
 +              //hlpr->mask.src.u.tcp.port = 0xFFFF;
 +              //hlpr->mask.dst.protonum = 0xFF;
-+              hlpr->max_expected = max_outstanding;
-+              hlpr->timeout = setup_timeout;
++              hlpr->expect_policy = &rtsp_exp_policy;
 +              hlpr->me = THIS_MODULE;
 +              hlpr->help = help;
 +