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).

diff --git a/Changes b/Changes
index 47dd20f..d35d505 100644 (file)
--- a/Changes
+++ b/Changes
@@ -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 CHAP support from Jordan Hrycaj (work in progress).
 - Sanity check that cluster_send_session is not called from a child
 - Add IPv6 support from Jonathan McDowell.
 - Add CHAP support from Jordan Hrycaj (work in progress).
 - 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
   (adminstrative) for everything else (suggestion from Chris Gates).
 - Only send RADIUS stop record in sessionshutdown when there's an ip address.
   (general error, try another LNS) when out of IP addresses, and 3
   (adminstrative) for everything else (suggestion from Chris Gates).
 - 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
 - Better cluster master collision resolution: keep a counter of state
 
 * Fri Dec 17 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.13
 - Better cluster master collision resolution: keep a counter of state

diff --git a/cluster.c b/cluster.c
index 8175119..549edfd 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.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 <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


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

diff --git a/l2tpns.spec b/l2tpns.spec
index 846d7c4..86b410f 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %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