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

reset .die on master takeover

Browse source
This commit is contained in:
Brendan O'Dea 2005-04-01 08:46:03 +00:00
parent 4f94b2184e
commit d7fbaf8b70
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -39,7 +39,8 @@
- Add result/error codes to CDN when shutting down sessions. Sends 2/7 - Add result/error codes to CDN when shutting down sessions. Sends 2/7
(general error, try another LNS) when out of IP addresses, and 3 (general error, try another LNS) when out of IP addresses, and 3
(adminstrative) for everything else (suggestion from Chris Gates). (adminstrative) for everything else (suggestion from Chris Gates).
- sessionshutdown: only send RADIUS stop when there's an ip address. - Only send RADIUS stop record in sessionshutdown when there's an ip address.
- Reset .die on master takeover.
* Fri Dec 17 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.13 * Fri Dec 17 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.13
- Better cluster master collision resolution: keep a counter of state - Better cluster master collision resolution: keep a counter of state

7
cluster.c
View file

@ -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.32 2005-04-01 08:46:03 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.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. // Accumulate un-sent byte counters.
session[i].cin += sess_local[i].cin; session[i].cin += sess_local[i].cin;
session[i].cout += sess_local[i].cout; session[i].cout += sess_local[i].cout;