X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/804d90bb9838fa1aca73192c14e0d7c57615ad1e..ecd6721a858ba8090f500c93ffa333ba742c4844:/cluster.c diff --git a/cluster.c b/cluster.c index 2d54b7d..d7a74fe 100644 --- a/cluster.c +++ b/cluster.c @@ -1,6 +1,6 @@ // L2TPNS Clustering Stuff -char const *cvs_id_cluster = "$Id: cluster.c,v 1.33 2005-04-01 08:55:29 bodea Exp $"; +char const *cvs_id_cluster = "$Id: cluster.c,v 1.36 2005-05-07 10:14:33 bodea Exp $"; #include #include @@ -594,7 +594,7 @@ void cluster_check_master(void) sess_local[i].cin = sess_local[i].cout = 0; - session[i].radius = 0; // Reset authentication as the radius blocks aren't up to date. + sess_local[i].radius = 0; // Reset authentication as the radius blocks aren't up to date. if (session[i].unique_id >= high_unique_id) // This is different to the index into the session table!!! high_unique_id = session[i].unique_id+1; @@ -1037,7 +1037,9 @@ static int cluster_handle_bytes(char *data, int size) session[b->sid].cin += b->in; session[b->sid].cout += b->out; - session[b->sid].last_packet = time_now; // Reset idle timer! + + if (b->in) + session[b->sid].last_packet = time_now; // Reset idle timer! size -= sizeof(*b); ++b; @@ -1362,6 +1364,11 @@ 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.