welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge back 2.0 branch changes

Browse source
This commit is contained in:
Brendan O'Dea 2005-02-14 06:58:38 +00:00
parent d833d6c26a
commit 983b38e12f
7 changed files with 91 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cluster.c
View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.30 2005-02-09 02:38:51 bodea Exp $";
char const *cvs_id_cluster = "$Id: cluster.c,v 1.31 2005-02-14 06:58:38 bodea Exp $";
#include <stdio.h>
#include <stdlib.h>
@ -571,10 +571,13 @@ 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..
@ -593,16 +596,14 @@ void cluster_check_master(void)
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();
@ -650,12 +651,14 @@ 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 = T_FREE; // 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
@ -663,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;
}