SOURCES (LINUX_2_6): kernel-nf_rtsp.patch - raw http://mike.it-loops.com/rt...

Tue Sep 23 12:12:41 CEST 2008

Author: zbyniu                       Date: Tue Sep 23 10:12:41 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- raw http://mike.it-loops.com/rtsp/rtsp-2.6.26.patch

---- Files affected:
SOURCES:
   kernel-nf_rtsp.patch (1.2.2.1 -> 1.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-nf_rtsp.patch
diff -u SOURCES/kernel-nf_rtsp.patch:1.2.2.1 SOURCES/kernel-nf_rtsp.patch:1.2.2.2

--- SOURCES/kernel-nf_rtsp.patch:1.2.2.1	Thu May  8 03:12:33 2008
+++ SOURCES/kernel-nf_rtsp.patch	Tue Sep 23 12:12:35 2008
@@ -246,15 +246,21 @@
 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
-@@ -0,0 +0,1 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
+@@ -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
 +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
-@@ -249,6 +249,16 @
- 	  If you want to compile it as a module, say M here and read
- 	  <file:Documentation/modules.txt>.  If unsure, say `Y'.
- 	
+@@ -249,6 +249,16 @@ config NF_CONNTRACK_TFTP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
 +config NF_CONNTRACK_RTSP
 +	tristate "RTSP protocol support"
 +	depends on NF_CONNTRACK
@@ -271,8 +277,14 @@
 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
-@@ -0,0 +0,1 @@
+@@ -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
 +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
@@ -795,7 +807,7 @@
 +    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_INET_PRE_ROUTING);
++    nf_nat_setup_info(ct, &mr.range[0], IP_NAT_MANIP_DST);
 +}
 +
 +
@@ -833,10 +845,10 @@
 +
 +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>
@@ -908,6 +920,8 @@
 +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,
@@ -1166,7 +1180,7 @@
 +
 +		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); 
 +
@@ -1303,6 +1317,9 @@
 +		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;
@@ -1320,8 +1337,7 @@
 +		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;
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-nf_rtsp.patch?r1=1.2.2.1&r2=1.2.2.2&f=u

