more state_state removal

[l2tpns.git] / cluster.c

diff --git a/cluster.c b/cluster.c
index 1dc5c53..8175119 100644 (file)
--- a/cluster.c
+++ b/cluster.c
@@ -1,6 +1,6 @@
 // L2TPNS Clustering Stuff
 
 // L2TPNS Clustering Stuff
 

-char const *cvs_id_cluster = "$Id: cluster.c,v 1.31 2005/02/14 06:58:38 bodea Exp $";
+char const *cvs_id_cluster = "$Id: cluster.c,v 1.33 2005/04/01 08:55:29 bodea Exp $";

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -580,9 +580,12 @@ void cluster_check_master(void)
                        continue;
                }
 
                        continue;
                }
 

-                       // Reset all the idle timeouts..
+                       // Reset idle timeouts..

                session[i].last_packet = time_now;
 
                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;
                        // Accumulate un-sent byte counters.
                session[i].cin += sess_local[i].cin;
                session[i].cout += sess_local[i].cout;


@@ -654,8 +657,6 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
                        if (session[i].tunnel == T_UNDEF) session[i].tunnel = T_FREE; // Defined.
                        continue;
                }
                        if (session[i].tunnel == T_UNDEF) session[i].tunnel = T_FREE; // Defined.
                        continue;
                }

-               if (session[i].tunnel != T_UNDEF)
-                       continue;

 
                if (session[i].tunnel == T_UNDEF)
                        ++config->cluster_undefined_sessions;
 
                if (session[i].tunnel == T_UNDEF)
                        ++config->cluster_undefined_sessions;