From: Brendan O'Dea Date: Fri, 1 Apr 2005 06:39:00 +0000 (+0000) Subject: only send RADIUS stop in sessionshutdown if there's an ip address X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~227 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/4f94b2184e87f8561bb483a2da315c8f127792a8 only send RADIUS stop in sessionshutdown if there's an ip address --- diff --git a/Changes b/Changes index cf623df..17db24a 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -* Thu Mar 10 2005 Brendan O'Dea 2.1.0 +* Fri Apr 1 2005 Brendan O'Dea 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 @@ -39,6 +39,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 (adminstrative) for everything else (suggestion from Chris Gates). +- sessionshutdown: only send RADIUS stop when there's an ip address. * Fri Dec 17 2004 Brendan O'Dea 2.0.13 - Better cluster master collision resolution: keep a counter of state diff --git a/l2tpns.c b/l2tpns.c index 6d6c08e..933c07b 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -4,7 +4,7 @@ // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // vim: sw=8 ts=8 -char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.88 2005-03-10 06:18:47 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.89 2005-04-01 06:39:00 bodea Exp $"; #include #include @@ -1453,7 +1453,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error) run_plugins(PLUGIN_KILL_SESSION, &data); } - if (!walled_garden && !session[s].die) + if (session[s].ip && !walled_garden && !session[s].die) { // RADIUS Stop message uint16_t r = session[s].radius; @@ -2644,7 +2644,7 @@ static int regular_cleanups(void) continue; } - // No data in IDLE_TIMEOUT seconds, send LCP ECHO + // No data in ECHO_TIMEOUT seconds, send LCP ECHO if (session[s].user[0] && (time_now - session[s].last_packet >= ECHO_TIMEOUT)) { uint8_t b[MAXCONTROL] = {0}; diff --git a/l2tpns.spec b/l2tpns.spec index cb1c718..846d7c4 100644 --- a/l2tpns.spec +++ b/l2tpns.spec @@ -43,5 +43,5 @@ rm -rf %{buildroot} %attr(644,root,root) /usr/share/man/man[58]/* %changelog -* Thu Mar 10 2005 Brendan O'Dea 2.1.0-1 +* Fri Apr 1 2005 Brendan O'Dea 2.1.0-1 - 2.1.0 release, see /usr/share/doc/l2tpns-2.1.0/Changes