disable for arm

5 files changed, 35 insertions, 99 deletions

diff --git a/package/rtsp/Makefile b/package/rtsp/Makefile
index 228d8f793..4078ab9eb 100644
--- a/package/rtsp/Makefile
+++ b/package/rtsp/Makefile
@@ -9,9 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
 PKG_DESCR:=		connection tracking for RTSP
 PKG_SECTION:=		kernel
+PKG_DEPENDS:=           kmod-ip-nf-iptables kmod-nf-conntrack
 PKG_URL:=		http://github.com/maru-sama/rtsp-linux-v2.6
 
 PKG_CFLINE_RTSP:=	depends on !ADK_TOOLCHAIN_ONLY
+PKG_ARCH_DEPENDS:=	!arm
 
 NO_DISTFILES:=          1
 
diff --git a/package/rtsp/src/Makefile b/package/rtsp/src/Makefile
index 55589a537..d7be5bab8 100644
--- a/package/rtsp/src/Makefile
+++ b/package/rtsp/src/Makefile
@@ -9,7 +9,7 @@ else
 
 # Normal Makefile
 
-all:
+all: 
 	$(MAKE) -C $(KERNELDIR) M=`pwd` modules
 
 debug:
diff --git a/package/rtsp/src/nf_conntrack_rtsp.c b/package/rtsp/src/nf_conntrack_rtsp.c
index 75aada89b..f165ea0c9 100644
--- a/package/rtsp/src/nf_conntrack_rtsp.c
+++ b/package/rtsp/src/nf_conntrack_rtsp.c
@@ -73,6 +73,7 @@ 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 protoff,
 				 unsigned int matchoff, unsigned int matchlen,struct ip_ct_rtsp_expect* prtspexp,
 				 struct nf_conntrack_expect *exp);
 void (*nf_nat_rtsp_hook_expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
@@ -177,15 +178,14 @@ rtsp_parse_transport(char* ptran, uint tranlen,
 		pr_info("sanity check failed\n");
 		return 0;
 	}
-
-	pr_debug("t='%.*s'\n", (int)tranlen-2, ptran);
+	
+	pr_debug("tran='%.*s'\n", (int)tranlen, ptran);
 	off += 10;
 	SKIP_WSPACE(ptran, tranlen, off);
 	
 	/* Transport: tran;field;field=val,tran;field;field=val,... */
 	while (off < tranlen) {
 		const char* pparamend;
-		const char* pdestport;
 		uint        nextparamoff;
 		
 		pparamend = memchr(ptran+off, ',', tranlen-off);
@@ -237,31 +237,6 @@ rtsp_parse_transport(char* ptran, uint tranlen,
 					rc = 1;
 				}
 			}
-			else if ((strncmp(ptran+off, "destination=",12) == 0) &&
-				((pdestport = memchr(ptran+off, ':', nextparamoff-off)) != NULL))
-			{
-				u_int16_t   port;
-				uint        numlen;
-
-				off += 12;
-				pdestport++;
-
-				off = pdestport - ptran;
-				numlen = nf_strtou16(ptran + off, &port);
-				off += numlen + 1;
-
-				if (prtspexp->loport != 0 && prtspexp->loport != port)
-				{
-					pr_debug("multiple ports found, port %hu ignored\n", port);
-				}
-				else
-				{
-					prtspexp->pbtype = pb_single;
-					prtspexp->loport = port;
-					prtspexp->hiport = port;
-					rc = 1;
-				}
-			}
 			
 			/*
 			 * Note we don't look for the destination parameter here.
@@ -294,7 +269,8 @@ void expected(struct nf_conn *ct, struct nf_conntrack_expect *exp)
 
 static inline int
 help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
-                struct nf_conn *ct, enum ip_conntrack_info ctinfo)
+         struct nf_conn *ct, enum ip_conntrack_info ctinfo, 
+         unsigned int protoff)
 {
 	struct ip_ct_rtsp_expect expinfo;
 	
@@ -370,15 +346,15 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
 		}
 
 		pr_debug("expect_related %pI4:%u-%pI4:%u\n",
-		       exp->tuple.src.u3.ip,
+		       &exp->tuple.src.u3.ip,
 		       ntohs(exp->tuple.src.u.udp.port),
-		       exp->tuple.dst.u3.ip,
+		       &exp->tuple.dst.u3.ip,
 		       ntohs(exp->tuple.dst.u.udp.port));
 
 		nf_nat_rtsp = rcu_dereference(nf_nat_rtsp_hook);
 		if (nf_nat_rtsp && ct->status & IPS_NAT_MASK)
 			/* pass the request off to the nat helper */
-			ret = nf_nat_rtsp(skb, ctinfo, hdrsoff, hdrslen, &expinfo, exp);
+			ret = nf_nat_rtsp(skb, ctinfo, protoff, hdrsoff, hdrslen, &expinfo, exp);
 		else if (nf_ct_expect_related(exp) != 0) {
 			pr_info("nf_conntrack_expect_related failed\n");
 			ret  = NF_DROP;
@@ -445,7 +421,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
 
 	switch (CTINFO2DIR(ctinfo)) {
 	case IP_CT_DIR_ORIGINAL:
-		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo);
+		ret = help_out(skb, rb_ptr, datalen, ct, ctinfo, protoff);
 		break;
 	case IP_CT_DIR_REPLY:
 		pr_debug("IP_CT_DIR_REPLY\n");
@@ -522,7 +498,7 @@ init(void)
 		} else {
 			sprintf(tmpname, "rtsp-%d", i);
 		}
-		hlpr->name = tmpname;
+		strlcpy(hlpr->name, tmpname, sizeof(hlpr->name));
 
 		pr_debug("port #%d: %d\n", i, ports[i]);
 
diff --git a/package/rtsp/src/nf_conntrack_rtsp.h b/package/rtsp/src/nf_conntrack_rtsp.h
index 0c9e3b848..356fb4419 100644
--- a/package/rtsp/src/nf_conntrack_rtsp.h
+++ b/package/rtsp/src/nf_conntrack_rtsp.h
@@ -50,6 +50,7 @@ struct ip_ct_rtsp_expect
 
 extern unsigned int (*nf_nat_rtsp_hook)(struct sk_buff *skb,
 				 enum ip_conntrack_info ctinfo,
+				 unsigned int protoff,
 				 unsigned int matchoff, unsigned int matchlen,
 				 struct ip_ct_rtsp_expect *prtspexp,
 				 struct nf_conntrack_expect *exp);
diff --git a/package/rtsp/src/nf_nat_rtsp.c b/package/rtsp/src/nf_nat_rtsp.c
index 7f1e73b6f..bb06b4502 100644
--- a/package/rtsp/src/nf_nat_rtsp.c
+++ b/package/rtsp/src/nf_nat_rtsp.c
@@ -32,8 +32,8 @@
 
 #include <linux/module.h>
 #include <net/tcp.h>
+#include <net/netfilter/nf_nat.h>
 #include <net/netfilter/nf_nat_helper.h>
-#include <net/netfilter/nf_nat_rule.h>
 #include "nf_conntrack_rtsp.h"
 #include <net/netfilter/nf_conntrack_expect.h>
 
@@ -98,7 +98,7 @@ get_skb_tcpdata(struct sk_buff* skb, char** pptcpdata, uint* ptcpdatalen)
  * Assumes that a complete transport header is present, ending with CR or LF
  */
 static int
-rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
+rtsp_mangle_tran(enum ip_conntrack_info ctinfo, unsigned int protoff,
                  struct nf_conntrack_expect* exp,
 								 struct ip_ct_rtsp_expect* prtspexp,
                  struct sk_buff* skb, uint tranoff, uint tranlen)
@@ -129,7 +129,7 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
         tranlen < 10 || !iseol(ptran[tranlen-1]) ||
         nf_strncasecmp(ptran, "Transport:", 10) != 0)
     {
-        pr_debug("sanity check failed\n");
+        pr_info("sanity check failed\n");
         return 0;
     }
     off += 10;
@@ -139,8 +139,8 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
     t = &exp->tuple;
     t->dst.u3.ip = newip;
 
-    extaddrlen = extip ? sprintf(szextaddr, "%pI4", extip)
-                       : sprintf(szextaddr, "%pI4", newip);
+    extaddrlen = extip ? sprintf(szextaddr, "%pI4", &extip)
+                       : sprintf(szextaddr, "%pI4", &newip);
     pr_debug("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
 
     rbuf1len = rbufalen = 0;
@@ -245,7 +245,6 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
             pfieldend = memchr(ptran+off, ';', nextparamoff-off);
             nextfieldoff = (pfieldend == NULL) ? nextparamoff : pfieldend-ptran+1;
 
-	    /*
             if (dstact != DSTACT_NONE && strncmp(ptran+off, "destination=", 12) == 0)
             {
                 if (strncmp(ptran+off+12, szextaddr, extaddrlen) == 0)
@@ -255,9 +254,10 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
                 if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun))
                 {
                     diff = nextfieldoff-off;
-                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff,
                                                          off, diff, NULL, 0))
                     {
+                        /* mangle failed, all we can do is bail */
 			nf_ct_unexpect_related(exp);
                         return 0;
                     }
@@ -268,7 +268,6 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
                     nextfieldoff -= diff;
                 }
             }
-	    */
 
             off = nextfieldoff;
         }
@@ -280,7 +279,6 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
         while (off < nextparamoff)
         {
             const char* pfieldend;
-            const char* pdestport;
             uint        nextfieldoff;
 
             pfieldend = memchr(ptran+off, ';', nextparamoff-off);
@@ -326,7 +324,7 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
                      * parameter 4 below is offset from start of tcp data.
                      */
                     diff = origlen-rbuflen;
-                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
+                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff,
                                               origoff, origlen, rbuf, rbuflen))
                     {
                         /* mangle failed, all we can do is bail */
@@ -340,46 +338,6 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
                     nextfieldoff -= diff;
                 }
             }
-            else if ((strncmp(ptran+off, "destination=", 12) == 0) && ((pdestport = memchr(ptran+off+12, ':', nextparamoff-(off + 12))) != NULL))
-	        {
-                u_int16_t   port;
-                uint        numlen;
-                uint        origoff;
-                uint        origlen;
-                char        rbuf[32];
-                uint        rbuflen = sprintf(rbuf, "%s:%s",szextaddr,rbuf1);
-
-	        pdestport++;
-
-                off += 12;
-                origoff = (ptran + off) - ptcp;
-                origlen = pdestport - (ptran + off);
-		off += origlen;
-                numlen = nf_strtou16(ptran+off, &port);
-                off += numlen;
-                origlen += numlen;
-		
-		if (port != prtspexp->loport)
-                {
-                    pr_debug("multiple ports found, port %hu ignored\n", port);
-                }
-                else
-                {
-	            diff = origlen-rbuflen;
-                    if (!nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
-                                                  origoff, origlen, rbuf, rbuflen))
-                    {
-                        /* mangle failed, all we can do is bail */
-                        nf_ct_unexpect_related(exp);
-                        return 0;
-                    }
-                    get_skb_tcpdata(skb, &ptcp, &tcplen);
-                    ptran = ptcp+tranoff;
-                    tranlen -= diff;
-                    nextparamoff -= diff;
-                    nextfieldoff -= diff;
-                }
-            }
 
             off = nextfieldoff;
         }
@@ -391,7 +349,7 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
 }
 
 static uint
-help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
+help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff,
 	 unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp, 
 	 struct nf_conntrack_expect* exp)
 {
@@ -420,7 +378,7 @@ help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
         }
         if (off > hdrsoff+hdrslen)
         {
-            pr_debug("!! overrun !!");
+            pr_info("!! overrun !!");
             break;
         }
         pr_debug("hdr: len=%u, %.*s", linelen, (int)linelen, ptcp+lineoff);
@@ -429,7 +387,7 @@ help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
         {
             uint oldtcplen = tcplen;
 	    pr_debug("hdr: Transport\n");
-            if (!rtsp_mangle_tran(ctinfo, exp, prtspexp, skb, lineoff, linelen))
+            if (!rtsp_mangle_tran(ctinfo, protoff, exp, prtspexp, skb, lineoff, linelen))
             {
 		pr_debug("hdr: Transport mangle failed");
                 break;
@@ -447,7 +405,7 @@ help_out(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
 }
 
 static unsigned int
-help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, 
+help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, unsigned int protoff,
      unsigned int matchoff, unsigned int matchlen, struct ip_ct_rtsp_expect* prtspexp,
      struct nf_conntrack_expect* exp)
 {
@@ -457,7 +415,7 @@ help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
     switch (dir)
     {
     case IP_CT_DIR_ORIGINAL:
-        rc = help_out(skb, ctinfo, matchoff, matchlen, prtspexp, exp);
+        rc = help_out(skb, ctinfo, protoff, matchoff, matchlen, prtspexp, exp);
         break;
     case IP_CT_DIR_REPLY:
 	pr_debug("unmangle ! %u\n", ctinfo);
@@ -472,26 +430,25 @@ help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
 
 static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
 {
-    struct nf_nat_ipv4_multi_range_compat mr;
-    u_int32_t newdstip, newsrcip, newip;
+    struct nf_nat_range range;
+    union nf_inet_addr newdstip, newsrcip, newip;
 
     struct nf_conn *master = ct->master;
 
-    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
-    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip;
+    newdstip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3;
+    newsrcip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3;
     //FIXME (how to port that ?)
     //code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
     newip = newdstip;
 
     pr_debug("newsrcip=%pI4, newdstip=%pI4, newip=%pI4\n",
-           newsrcip, newdstip, newip);
+           &newsrcip.ip, &newdstip.ip, &newip.ip);
 
-    mr.rangesize = 1;
     // We don't want to manip the per-protocol, just the IPs. 
-    mr.range[0].flags = NF_NAT_RANGE_MAP_IPS;
-    mr.range[0].min_ip = mr.range[0].max_ip = newip;
+    range.flags = NF_NAT_RANGE_MAP_IPS;
+    range.min_addr = range.max_addr = newip;
 
-    nf_nat_setup_info(ct, &mr.range[0], NF_NAT_MANIP_DST);
+    nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST);
 }