[netfilter-cvslog] r3594 - branches/netfilter-ha/linux-2.6/ct_sync

[hidden at netfilter.org]

Author: hidden at netfilter.org
Date: 2005-01-13 00:04:40 +0100 (Thu, 13 Jan 2005)
New Revision: 3594

Modified:
   branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c
Log:
Revision: hidden at sch.bme.hu--2005-public/netfilter-ha--mainline--1.0--patch-16

Don't declare cmarkbit unless connmark support is available.

* ct_sync/ct_sync_main.c: use cmarkbit only if connmark support is available
(init_or_cleanup): print cmarkbit information when loading the module and
connmark support was compiled in


Modified: branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c
===================================================================
--- branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-01-12 23:04:35 UTC (rev 3593)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-01-12 23:04:40 UTC (rev 3594)
@@ -73,11 +73,14 @@
 module_param(syncdev, charp, 0000);
 static int l2drop = 0;
 module_param(l2drop, int, 0000);
-static int cmarkbit = sizeof(unsigned long) * 8 - 1;
-module_param(cmarkbit, int, 0000);
 static int notrack = 1;
 module_param(notrack, int, 0000);
 
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
+static int cmarkbit = sizeof(unsigned long) * 8 - 1;
+module_param(cmarkbit, int, 0000);
+#endif
+
 /* thread wait queue heads */
 static DECLARE_WAIT_QUEUE_HEAD(ct_sync_rcv_wait);
 
@@ -1744,7 +1747,9 @@
 			sizeof(struct ct_sync_pkthdr));
 	CT_SYNC_DEBUG("ct_sync_msghdr: %d bytes\n", 
 			sizeof(struct ct_sync_msghdr));
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
 	CT_SYNC_DEBUG("cmarkbit: %d\n", cmarkbit);
+#endif
 
 	if (strcmp(syncdev, "") == 0) {
 		CT_SYNC_ERR("Required parameter syncdev is missing.\n");
@@ -1803,7 +1808,7 @@
 
 	/* register statistics */
 	ct_sync_stat = create_proc_entry("ct_sync", 0, proc_net_stat);
-	printk("proc_net_stat=%p, ct_sync_stat=%p\n", proc_net_stat, ct_sync_stat);
+	CT_SYNC_DEBUG("proc_net_stat=%p, ct_sync_stat=%p\n", proc_net_stat, ct_sync_stat);
 	if (!ct_sync_stat)
 		goto error_sysctl;
 	ct_sync_stat->proc_fops = &cts_stat_seq_fops;
@@ -1833,8 +1838,15 @@
 	/* Now we have all of our infrastructure up and running */
 	printk(KERN_NOTICE "netfilter conntrack_sync version %s loaded\n",
 	       CT_SYNC_VERSION);
-	CT_SYNC_INFO("parameters: 'syncdev=%s l2drop=%u notrack=%u'\n",
-		     syncdev, l2drop, notrack);
+	CT_SYNC_INFO("parameters: syncdev='%s' l2drop=%u notrack=%u"
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
+		     " cmarkbit=%u"
+#endif
+		     "\n", syncdev, l2drop, notrack
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
+		     , cmarkbit
+#endif
+		     );
 
         return 0;