From: Brendan O'Dea Date: Fri, 24 Jun 2005 07:05:03 +0000 (+0000) Subject: Don't resend IPCP while still in progress X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~153 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/39071c8ab5aff4643195326c9d481a1f1721da04?ds=inline;hp=af8528e07d619697d6470cc611159b9dd340eb24 Don't resend IPCP while still in progress --- diff --git a/Changes b/Changes index c987d1e..3b885fd 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +* Fri Jun 24 2005 Brendan O'Dea 2.1.2 +- Don't resend IPCP while still in progress. + * Tue Jun 14 2005 Brendan O'Dea 2.1.1 - Add missing newline to backtrace macro. - Don't send CDN for each session when shutting down tunnels (this is diff --git a/l2tpns.c b/l2tpns.c index b1eb66a..58246b3 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.111 2005-06-14 04:47:24 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.112 2005-06-24 07:05:04 bodea Exp $"; #include #include @@ -2717,7 +2717,8 @@ static void regular_cleanups(double period) continue; } - if (session[s].ip && !(session[s].flags & SF_IPCP_ACKED)) + if (session[s].ip && !(session[s].flags & SF_IPCP_ACKED) + && !(sess_local[s].radius && radius[sess_local[s].radius].state == RADIUSIPCP)) { // IPCP has not completed yet. Resend LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n"); @@ -2833,7 +2834,8 @@ static void regular_cleanups(double period) && !sess_local[s].radius // RADIUS already in progress && time_now - sess_local[s].last_interim >= config->radius_interim) { - if (!(r = radiusnew(s))) + int rad = radiusnew(s); + if (!rad) { LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Interim message\n"); STAT(radius_overflow); @@ -2843,7 +2845,7 @@ static void regular_cleanups(double period) LOG(3, s, session[s].tunnel, "Sending RADIUS Interim for %s (%u)\n", session[s].user, session[s].unique_id); - radiussend(r, RADIUSINTERIM); + radiussend(rad, RADIUSINTERIM); sess_local[s].last_interim = time_now; s_actions++; } diff --git a/l2tpns.h b/l2tpns.h index 4875ceb..6a359fd 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -1,5 +1,5 @@ // L2TPNS Global Stuff -// $Id: l2tpns.h,v 1.78 2005-06-12 06:10:29 bodea Exp $ +// $Id: l2tpns.h,v 1.79 2005-06-24 07:05:04 bodea Exp $ #ifndef __L2TPNS_H__ #define __L2TPNS_H__ @@ -15,7 +15,7 @@ #include #include -#define VERSION "2.1.1" +#define VERSION "2.1.2" // Limits #define MAXTUNNEL 500 // could be up to 65535 diff --git a/l2tpns.spec b/l2tpns.spec index 9902367..6a9cb21 100644 --- a/l2tpns.spec +++ b/l2tpns.spec @@ -1,6 +1,6 @@ Summary: A high-speed clustered L2TP LNS Name: l2tpns -Version: 2.1.1 +Version: 2.1.2 Release: 1 Copyright: GPL Group: System Environment/Daemons @@ -43,5 +43,5 @@ rm -rf %{buildroot} %attr(644,root,root) /usr/share/man/man[58]/* %changelog -* Tue Jun 14 2005 Brendan O'Dea 2.1.1-1 -- 2.1.1 release, see /usr/share/doc/l2tpns-2.1.1/Changes +* Fri Jun 24 2005 Brendan O'Dea 2.1.2-1 +- 2.1.2 release, see /usr/share/doc/l2tpns-2.1.2/Changes