This commit is contained in:
Brendan O'Dea 2004-12-15 02:56:38 +00:00
parent 24836565c0
commit c1a9baad0e

View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.23 2004-12-15 01:04:34 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.24 2004-12-15 02:56:38 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <sys/file.h> #include <sys/file.h>
@ -1149,19 +1149,20 @@ static int cluster_process_heartbeat(u8 * data, int size, int more, u8 * p, u32
kill(0, SIGTERM); kill(0, SIGTERM);
exit(1); exit(1);
} else if (h->table_version < config->cluster_table_version) {
return -1;
} }
if (h->table_version < config->cluster_table_version)
return -1;
} }
if (basetime > h->basetime) { if (basetime > h->basetime) {
LOG(0, 0, 0, "They're an older master than me so I'm gone!\n"); LOG(0, 0, 0, "They're an older master than me so I'm gone!\n");
kill(0, SIGTERM); kill(0, SIGTERM);
exit(1); exit(1);
} else if (basetime < h->basetime)
return -1;
} }
if (basetime < h->basetime)
return -1;
if (my_address < addr) { // Tie breaker. if (my_address < addr) { // Tie breaker.
LOG(0, 0, 0, "They're a higher IP address than me, so I'm gone!\n"); LOG(0, 0, 0, "They're a higher IP address than me, so I'm gone!\n");
kill(0, SIGTERM); kill(0, SIGTERM);