Update .last_packet in cluster_handle_bytes only when there have

been bytes received from the modem (dead sessions were having the
idle timeout reset by stray packets).
This commit is contained in:
bodea 2005-05-02 09:06:05 +00:00
parent 469f01fe49
commit 715e74f4c7
3 changed files with 11 additions and 5 deletions

View file

@ -1,4 +1,4 @@
* Fri Apr 1 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0 * Mon May 2 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0
- Add IPv6 support from Jonathan McDowell. - Add IPv6 support from Jonathan McDowell.
- Add CHAP support from Jordan Hrycaj (work in progress). - Add CHAP support from Jordan Hrycaj (work in progress).
- Sanity check that cluster_send_session is not called from a child - Sanity check that cluster_send_session is not called from a child
@ -40,7 +40,11 @@
(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).
- Only send RADIUS stop record in sessionshutdown when there's an ip address. - Only send RADIUS stop record in sessionshutdown when there's an ip address.
- Reset .die on master takeover. - Reset .die on master takeover (so that dying sessions don't have to
hang around until the new master has the same uptime as the old one).
- Update .last_packet in cluster_handle_bytes only when there have
been bytes received from the modem (dead sessions were having the
idle timeout reset by stray packets).
* 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

View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.33 2005/04/01 08:55:29 bodea Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.34 2005/05/02 09:06:05 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1037,6 +1037,8 @@ static int cluster_handle_bytes(char *data, int size)
session[b->sid].cin += b->in; session[b->sid].cin += b->in;
session[b->sid].cout += b->out; session[b->sid].cout += b->out;
if (b->in)
session[b->sid].last_packet = time_now; // Reset idle timer! session[b->sid].last_packet = time_now; // Reset idle timer!
size -= sizeof(*b); size -= sizeof(*b);

View file

@ -43,5 +43,5 @@ rm -rf %{buildroot}
%attr(644,root,root) /usr/share/man/man[58]/* %attr(644,root,root) /usr/share/man/man[58]/*
%changelog %changelog
* Fri Apr 1 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0-1 * Mon May 2 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.0-1
- 2.1.0 release, see /usr/share/doc/l2tpns-2.1.0/Changes - 2.1.0 release, see /usr/share/doc/l2tpns-2.1.0/Changes