[netfilter-cvslog] r4053 - trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-27 17:29:15 +0200 (Mon, 27 Jun 2005)
New Revision: 4053

Modified:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c
Log:
make conntrack compile


Modified: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c	2005-06-27 15:18:57 UTC (rev 4052)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/ip_conntrack_rtsp.c	2005-06-27 15:29:15 UTC (rev 4053)
@@ -62,7 +62,7 @@
 MODULE_AUTHOR("Tom Marshall <tmarshall at real.com>");
 MODULE_DESCRIPTION("RTSP connection tracking module");
 MODULE_LICENSE("GPL");
-module_param_array(ports, int, &ports_c, 0400);
+module_param_array(ports, int, &num_ports, 0400);
 MODULE_PARM_DESC(ports, "port numbers of RTSP servers");
 module_param(max_outstanding, int, 0400);
 MODULE_PARM_DESC(max_outstanding, "max number of outstanding SETUP requests per RTSP session");
@@ -74,8 +74,7 @@
 
 unsigned int (*ip_nat_rtsp_hook)(struct sk_buff **pskb,
 				 enum ip_conntrack_info ctinfo,
-				 unsigned int matchoff,
-				 unsigned int matchlen,
+				 struct ip_ct_rtsp_expect *expinfo,
 				 struct ip_conntrack_expect *exp);
 EXPORT_SYMBOL_GPL(ip_nat_rtsp_hook);
 
@@ -294,7 +293,6 @@
         uint    lineoff = 0;
         uint    linelen = 0;
         uint    off;
-        int     rc;
 
         if (!rtsp_parse_message(pdata, datalen, &dataoff,
                                 &hdrsoff, &hdrslen,
@@ -341,7 +339,7 @@
               expinfo.hiport);
 
 	exp = ip_conntrack_expect_alloc();
-	if (!exp)
+	if (!exp) {
 		ret = NF_DROP;
 		goto out;
 	}
@@ -368,9 +366,9 @@
 
 	if (ip_nat_rtsp_hook)
         	/* pass the request off to the nat helper */
-		ret = ip_nat_rtsp_hook(pskb, ctinfo, hooknum, &expinfo, exp);
+		ret = ip_nat_rtsp_hook(pskb, ctinfo, &expinfo, exp);
 	else if (ip_conntrack_expect_related(exp) != 0) {
-  		INFOP("ip_conntrack_expect_related failed\n", rc);
+  		INFOP("ip_conntrack_expect_related failed\n");
 		ip_conntrack_expect_free(exp);
 		ret  = NF_DROP;
 	}
@@ -395,7 +393,7 @@
     struct tcphdr _tcph, *th;
     unsigned int dataoff, datalen;
     char *rb_ptr;
-    int ret;
+    int ret = NF_DROP;
 
     /* Until there's been traffic both ways, don't look in packets. */
     if (ctinfo != IP_CT_ESTABLISHED && 
@@ -437,10 +435,11 @@
     switch (CTINFO2DIR(ctinfo))
     {
     case IP_CT_DIR_ORIGINAL:
-        ret = help_out(*pskb, rb_ptr, datalen, ct, ctinfo);
+        ret = help_out(pskb, rb_ptr, datalen, ct, ctinfo);
         break;
     case IP_CT_DIR_REPLY:
-        ret = help_in(*pskb, rb_ptr, datalen, ct, ctinfo);
+	/* inbound packet: server->client */
+        ret = NF_ACCEPT;
         break;
     }
 
@@ -500,8 +499,7 @@
         hlpr->mask.dst.protonum = 0xFF;
         hlpr->max_expected = max_outstanding;
         hlpr->timeout = setup_timeout;
-        hlpr->flags = IP_CT_HELPER_F_REUSE_EXPECT;
-        hlpr->me = ip_conntrack_rtsp;
+        hlpr->me = THIS_MODULE;
         hlpr->help = help;
 
         tmpname = &rtsp_names[i][0];
@@ -530,9 +528,5 @@
     return 0;
 }
 
-#ifdef CONFIG_IP_NF_NAT_NEEDED
-EXPORT_SYMBOL(ip_rtsp_lock);
-#endif
-
 module_init(init);
 module_exit(fini);