From: Brendan O'Dea Date: Wed, 15 Dec 2004 02:56:38 +0000 (+0000) Subject: typo X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~273 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/c1a9baad0e3b18beddd84ba567dc448b543cb45a?ds=sidebyside typo --- diff --git a/cluster.c b/cluster.c index dd5d9c2..dc62252 100644 --- a/cluster.c +++ b/cluster.c @@ -1,6 +1,6 @@ // 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 #include @@ -1149,19 +1149,20 @@ static int cluster_process_heartbeat(u8 * data, int size, int more, u8 * p, u32 kill(0, SIGTERM); 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) { LOG(0, 0, 0, "They're an older master than me so I'm gone!\n"); kill(0, SIGTERM); exit(1); - } else if (basetime < h->basetime) - return -1; } + if (basetime < h->basetime) + return -1; + if (my_address < addr) { // Tie breaker. LOG(0, 0, 0, "They're a higher IP address than me, so I'm gone!\n"); kill(0, SIGTERM);