From: Brendan O'Dea <bod@optus.net>
Date: Mon, 27 Jun 2005 04:52:54 +0000 (+0000)
Subject: clear cluster_master on election so that slaves will accept a new master
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~151
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/e5695ec41ca1fbc40d410e34f0163fb9b35ffb19?ds=sidebyside

clear cluster_master on election so that slaves will accept a new master
---

diff --git a/Changes b/Changes
index 24440df..66e4826 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
-* Fri Jun 24 2005 Brendan O'Dea <bod@optus.net> 2.1.2
+* Mon Jun 27 2005 Brendan O'Dea <bod@optus.net> 2.1.2
 - Don't resend IPCP while still in progress.
 - Ignore duplicate ACKs for IPCP.
 - Clear RADIUSIPCP for walled garden sessions on ACK.
+- Clear cluster_master on election so that slaves will accept a new master.
 
 * Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1
 - Add missing newline to backtrace macro.
diff --git a/cluster.c b/cluster.c
index a6350e0..a8f34d0 100644
--- a/cluster.c
+++ b/cluster.c
@@ -1,6 +1,6 @@
 // L2TPNS Clustering Stuff
 
-char const *cvs_id_cluster = "$Id: cluster.c,v 1.42 2005-06-14 05:37:09 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.43 2005-06-27 04:52:54 bodea Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -533,6 +533,7 @@ void cluster_check_master(void)
 		return;	// Everything's ok!
 
 	config->cluster_last_hb = TIME + 1;	// Just the one election thanks.
+	config->cluster_master_address = 0;
 
 	LOG(0, 0, 0, "Master timed out! Holding election...\n");
 
@@ -568,7 +569,6 @@ void cluster_check_master(void)
 		// to become a master!!!
 
 	config->cluster_iam_master = 1;
-	config->cluster_master_address = 0;
 
 	LOG(0, 0, 0, "I am declaring myself the master!\n");
 
@@ -1377,8 +1377,7 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
 		// Note that after a clean failover, the cluster_master_address
 		// is cleared, so this doesn't run. 
 		//
-	if (config->cluster_master_address && addr != config->cluster_master_address
-	    && (config->cluster_last_hb + config->cluster_hb_timeout - 11) > TIME) {
+	if (config->cluster_master_address && addr != config->cluster_master_address) {
 		    LOG(0, 0, 0, "Ignoring stray heartbeat from %s, current master %s has not yet timed out (last heartbeat %.1f seconds ago).\n",
 			    fmtaddr(addr, 0), fmtaddr(config->cluster_master_address, 1),
 			    0.1 * (TIME - config->cluster_last_hb));
diff --git a/l2tpns.spec b/l2tpns.spec
index 6a9cb21..0557ab7 100644
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
-* Fri Jun 24 2005 Brendan O'Dea <bod@optus.net> 2.1.2-1
+* Mon Jun 27 2005 Brendan O'Dea <bod@optus.net> 2.1.2-1
 - 2.1.2 release, see /usr/share/doc/l2tpns-2.1.2/Changes