X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f60c61f7d4236058f60a3aac776dcddba84fb8f4..024ba5b35b10ce4008cec64602f427c1614fd729:/cluster.c?ds=sidebyside diff --git a/cluster.c b/cluster.c index 95c64a2..e3e7f01 100644 --- a/cluster.c +++ b/cluster.c @@ -1,6 +1,6 @@ // L2TPNS Clustering Stuff -char const *cvs_id_cluster = "$Id: cluster.c,v 1.26.2.3 2005/02/14 05:59:27 bodea Exp $"; +char const *cvs_id_cluster = "$Id: cluster.c,v 1.26.2.5 2005/05/02 09:03:27 bodea Exp $"; #include #include @@ -579,9 +579,12 @@ void cluster_check_master(void) continue; } - // Reset all the idle timeouts.. + // Reset idle timeouts.. session[i].last_packet = time_now; + // Reset die relative to our uptime rather than the old master's + if (session[i].die) session[i].die = TIME; + // Accumulate un-sent byte counters. session[i].cin += sess_local[i].cin; session[i].cout += sess_local[i].cout; @@ -1028,7 +1031,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;