Update .last_packet in cluster_handle_bytes only when there have
[l2tpns.git] / cluster.c
index 093d944..e3e7f01 100644 (file)
--- 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.1 2005/01/06 01:39:23 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.26.2.5 2005/05/02 09:03:27 bodea Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -405,18 +405,18 @@ void master_update_counts(void)
                if ( walk_session_number > config->cluster_highest_sessionid)
                        walk_session_number = 1;
 
-               if (!sess_count[walk_session_number].cin && !sess_count[walk_session_number].cout)
+               if (!sess_local[walk_session_number].cin && !sess_local[walk_session_number].cout)
                        continue; // Unused. Skip it.
 
                b[c].sid = walk_session_number;
-               b[c].in = sess_count[walk_session_number].cin;
-               b[c].out = sess_count[walk_session_number].cout;
+               b[c].in = sess_local[walk_session_number].cin;
+               b[c].out = sess_local[walk_session_number].cout;
 
                if (++c > MAX_B_RECS)   // Send a max of 400 elements in a packet.
                        break;
 
                        // Reset counters.
-               sess_count[walk_session_number].cin = sess_count[walk_session_number].cout = 0;
+               sess_local[walk_session_number].cin = sess_local[walk_session_number].cout = 0;
        }
 
        if (!c)         // Didn't find any that changes. Get out of here!
@@ -570,38 +570,42 @@ void cluster_check_master(void)
                        ++count;
                }
 
-               if (session[i].tunnel == T_FREE) { // Unused session. Add to free list.
+               if (!session[i].opened) { // Unused session. Add to free list.
+                       memset(&session[i], 0, sizeof(session[i]));
+                       session[i].tunnel = T_FREE;
                        session[last_free].next = i;
                        session[i].next = 0;
                        last_free = i;
+                       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_count[i].cin;
-               session[i].cout += sess_count[i].cout;
-               session[i].total_cin += sess_count[i].cin;
-               session[i].total_cout += sess_count[i].cout;
+               session[i].cin += sess_local[i].cin;
+               session[i].cout += sess_local[i].cout;
+               session[i].total_cin += sess_local[i].cin;
+               session[i].total_cout += sess_local[i].cout;
 
-               sess_count[i].cin = sess_count[i].cout = 0;
+               sess_local[i].cin = sess_local[i].cout = 0;
 
                session[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;
 
-
                session[i].tbf_in = session[i].tbf_out = 0; // Remove stale pointers from old master.
                throttle_session(i, session[i].throttle_in, session[i].throttle_out);
 
-               if (session[i].tunnel != T_FREE && i > config->cluster_highest_sessionid)
-                       config->cluster_highest_sessionid = i;
+               config->cluster_highest_sessionid = i;
        }
 
        session[last_free].next = 0;    // End of chain.
-       last_id = high_unique_id;               // Keep track of the highest used session ID.
+       last_id = high_unique_id;       // Keep track of the highest used session ID.
 
        become_master();
 
@@ -649,12 +653,12 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
        config->cluster_undefined_sessions = 0;
        for (i = 1 ; i < MAXSESSION; ++i) {
                if (i > highsession) {
-                       session[i].tunnel = 0; // Defined.
+                       if (session[i].tunnel == T_UNDEF) session[i].tunnel = T_FREE; // Defined.
                        continue;
                }
-               if (session[i].tunnel != T_UNDEF)
-                       continue;
-               ++config->cluster_undefined_sessions;
+
+               if (session[i].tunnel == T_UNDEF)
+                       ++config->cluster_undefined_sessions;
        }
 
                // Clear out defined tunnels, counting the number of
@@ -662,12 +666,12 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
        config->cluster_undefined_tunnels = 0;
        for (i = 1 ; i < MAXTUNNEL; ++i) {
                if (i > hightunnel) {
-                       tunnel[i].state = TUNNELFREE; // Defined.
+                       if (tunnel[i].state == TUNNELUNDEF) tunnel[i].state = TUNNELFREE; // Defined.
                        continue;
                }
-               if (tunnel[i].state != TUNNELUNDEF)
-                       continue;
-               ++config->cluster_undefined_tunnels;
+
+               if (tunnel[i].state == TUNNELUNDEF)
+                       ++config->cluster_undefined_tunnels;
        }
 
 
@@ -1027,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;