re-order sessiont elements to remove padding

[l2tpns.git] / cluster.c

diff --git a/cluster.c b/cluster.c
index 1dc5c53..9cead15 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.36 2005/05/07 10:14:33 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;


@@ -591,7 +594,7 @@ void cluster_check_master(void)
 
                sess_local[i].cin = sess_local[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.
+               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;
 
                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;


@@ -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;


@@ -1036,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].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;
 
                size -= sizeof(*b);
                ++b;


@@ -1361,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).
                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.
                return cluster_catchup_slave(more, addr);
 
        case C_FORWARD: { // Forwarded control packet. pass off to processudp.