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

[hidden at netfilter.org]

Author: hidden at netfilter.org
Date: 2005-01-05 00:32:37 +0100 (Wed, 05 Jan 2005)
New Revision: 3573

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-9

Fix gcc warnings and remove some code already commented out.

* ct_sync/ct_sync_main.c (init_or_cleanup): removed initial state change code
  (was already commented out), fixed some compiler warnings


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-04 23:32:25 UTC (rev 3572)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-01-04 23:32:37 UTC (rev 3573)
@@ -963,8 +963,8 @@
 		.data		= &cts_proto_recovery_threshold,
 		.maxlen		= sizeof(int),
 		.proc_handler	= &proc_dointvec_minmax,
-		.extra1		= 0,
-		.extra2		= 32767,
+		.extra1		= (void *)0,
+		.extra2		= (void *)32767,
 	},
 	{ .ctl_name = 0 }
 };
@@ -1809,37 +1809,12 @@
 		goto error_sysctl;
 	ct_sync_stat->proc_fops = &cts_stat_seq_fops;
 
-#if 0
-	/* FIXME: should use the unified state change functions */
-	if (state) {
-		/* master: register notify callbacks */
-		ret = ip_conntrack_register_notifier(&ct_sync_notifier);
-		if (ret < 0) {
-			CT_SYNC_ERR("unable to register notifier\n");
-			goto error_stat;
-		}
-
-		if (cts_proto_become_master(cts_cfg.protoh) < 0) {
-			ret = -1;
-			goto error_notify;
-		}
-	} else {
-		/* slave: stop timers of conntracks */
-		/* FIXME: should we stop all timers on startup? This could cause
-		 * connections left in the hashes for an indefinite amount
-		 * of time... */
-		//ct_sync_stop_timers();
-
-		/* initsync request is handled by kernel thread */
-	}
-#endif
-
 	/* start threads */
 	rcv_thread = kthread_run(ct_sync_rcv_thread_main, NULL,
 				 "ct_sync_rcv");
 	if (IS_ERR(rcv_thread)) {
 		ret = PTR_ERR(rcv_thread);
-		goto error_notify;
+		goto error_stat;
 	}
 
 	send_thread = kthread_run(ct_sync_send_thread_main, NULL,
@@ -1882,7 +1857,7 @@
 	if (err < 0) {
 		CT_SYNC_INFO("unable to stop receive thread\n");
 	}
-error_notify:
+
 	CT_SYNC_DEBUG("unregistering conntrack notifier\n");
 	ip_conntrack_unregister_notifier(&ct_sync_notifier);
 error_stat: