[netfilter-cvslog] r4028 - in trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11: include/linux/netfilter_ipv4 net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-27 15:11:57 +0200 (Mon, 27 Jun 2005)
New Revision: 4028

Removed:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3
Modified:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_nat_rtsp.c
Log:
fix further 2.6.11+ issues


Deleted: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3	2005-06-27 12:33:00 UTC (rev 4027)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_3	2005-06-27 13:11:57 UTC (rev 4028)
@@ -1,2 +0,0 @@
-	/* insert conntrack helper private data (expect) here */
-	struct ip_ct_rtsp_expect exp_rtsp_info;

Modified: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_nat_rtsp.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_nat_rtsp.c	2005-06-27 12:33:00 UTC (rev 4027)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_nat_rtsp.c	2005-06-27 13:11:57 UTC (rev 4028)
@@ -114,6 +114,7 @@
 static int
 rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
                  struct ip_conntrack_expect* exp,
+    		 struct ip_ct_rtsp_expect* prtspexp,
                  struct sk_buff** pskb, uint tranoff, uint tranlen)
 {
     char*       ptcp;
@@ -129,7 +130,6 @@
     uint        diff;           /* Number of bytes we removed */
 
     struct ip_conntrack *ct = exp->master;
-    struct ip_ct_rtsp_expect* prtspexp = &exp->help.exp_rtsp_info;
     struct ip_conntrack_tuple t;
 
     char    szextaddr[15+1];
@@ -428,7 +428,7 @@
         if (nf_strncasecmp(ptcp+lineoff, "Transport:", 10) == 0)
         {
             uint oldtcplen = tcplen;
-            if (!rtsp_mangle_tran(ct, ctinfo, exp, pskb, lineoff, linelen))
+            if (!rtsp_mangle_tran(ct, ctinfo, exp, prtspexp, pskb, lineoff, linelen))
             {
                 break;
             }