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

[hidden at netfilter.org]

Author: hidden at netfilter.org
Date: 2005-02-13 22:49:52 +0100 (Sun, 13 Feb 2005)
New Revision: 3686

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

Avoid double registration of notifier.

* ct_sync/ct_sync_main.c (ct_sync_state_transition): always unregister
  notifier when transitioning into any of the slave states




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-02-13 18:33:57 UTC (rev 3685)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-02-13 21:49:52 UTC (rev 3686)
@@ -1566,6 +1566,8 @@
 
 	case CT_SYNC_PSTATE_SLAVE_INIT:
 	case CT_SYNC_PSTATE_SLAVE_SYNRECV:
+	case CT_SYNC_PSTATE_SLAVE_SYNSENT:
+	case CT_SYNC_PSTATE_SLAVE_RUNNING:
 		if (oldstate == CT_SYNC_PSTATE_NONE) {
 			/* initial slave synchronization: we don't stop
 			 * conntrack timers when being initialized to
@@ -1580,6 +1582,8 @@
 		break;
 
 	case CT_SYNC_PSTATE_MASTER_INIT:
+	case CT_SYNC_PSTATE_MASTER_ADVSENT:
+	case CT_SYNC_PSTATE_MASTER_RUNNING:
 		if (oldstate < CT_SYNC_PSTATE_MASTER_INIT) {
 			/* transition from none/slave to master */
 			ct_sync_start_timers();