From: Brendan O'Dea <bod@optus.net>
Date: Tue, 24 May 2005 07:45:13 +0000 (+0000)
Subject: back out C_LASTSEEN change (to be replaced by different solution in merge from 2.0)
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~180
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/211cb9427c7f78f59928d7f850721e7d0dfbf271?ds=sidebyside

back out C_LASTSEEN change (to be replaced by different solution in merge from 2.0)
---

diff --git a/Changes b/Changes
index 0b2f15f..09b32a3 100644
--- a/Changes
+++ b/Changes
@@ -56,8 +56,6 @@
   is read.
 - Fix leak in session freelist when initial RADIUS session allocation
   fails.
-- Don't process C_LASTSEEN unless we're a master (otherwise a crashed
-  master kills all slaves once restarted).
 - Make "show running-config" a privileged command (contains clear text
   shared secrets).
 - Add sessionctl plugin to provide drop/kill via nsctl.
diff --git a/cluster.c b/cluster.c
index 0c46b19..b4aa1d9 100644
--- a/cluster.c
+++ b/cluster.c
@@ -1,6 +1,6 @@
 // L2TPNS Clustering Stuff
 
-char const *cvs_id_cluster = "$Id: cluster.c,v 1.37 2005-05-08 08:00:49 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.38 2005-05-24 07:45:13 bodea Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1491,11 +1491,6 @@ int processcluster(char *data, int size, in_addr_t addr)
 		return cluster_add_peer(addr, more, (pingt *) p, s);
 
 	case C_LASTSEEN:	// Catch up a slave (slave missed a packet).
-		if (!config->cluster_iam_master) { // huh?
-			LOG(0, 0, 0, "I'm not the master, but I got a C_LASTSEEN from %s?\n", fmtaddr(addr, 0));
-			return -1;
-		}
-
 		return cluster_catchup_slave(more, addr);
 
 	case C_FORWARD: { // Forwarded control packet. pass off to processudp.