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

Don't resend IPCP while still in progress

Browse source
This commit is contained in:
Brendan O'Dea 2005-06-24 07:05:03 +00:00
parent af8528e07d
commit 39071c8ab5
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,3 +1,6 @@
* Fri Jun 24 2005 Brendan O'Dea <bod@optus.net> 2.1.2
- Don't resend IPCP while still in progress.
* Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1 * Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1
- Add missing newline to backtrace macro. - Add missing newline to backtrace macro.
- Don't send CDN for each session when shutting down tunnels (this is - Don't send CDN for each session when shutting down tunnels (this is

10
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // 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 <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -2717,7 +2717,8 @@ static void regular_cleanups(double period)
continue; 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 // IPCP has not completed yet. Resend
LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n"); 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 && !sess_local[s].radius // RADIUS already in progress
&& time_now - sess_local[s].last_interim >= config->radius_interim) && 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"); LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Interim message\n");
STAT(radius_overflow); 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", LOG(3, s, session[s].tunnel, "Sending RADIUS Interim for %s (%u)\n",
session[s].user, session[s].unique_id); session[s].user, session[s].unique_id);
radiussend(r, RADIUSINTERIM); radiussend(rad, RADIUSINTERIM);
sess_local[s].last_interim = time_now; sess_local[s].last_interim = time_now;
s_actions++; s_actions++;
} }

4
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // 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__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -15,7 +15,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <libcli.h> #include <libcli.h>
#define VERSION "2.1.1" #define VERSION "2.1.2"
// Limits // Limits
#define MAXTUNNEL 500 // could be up to 65535 #define MAXTUNNEL 500 // could be up to 65535

6
l2tpns.spec
View file

@ -1,6 +1,6 @@
Summary: A high-speed clustered L2TP LNS Summary: A high-speed clustered L2TP LNS
Name: l2tpns Name: l2tpns
Version: 2.1.1 Version: 2.1.2
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -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
* Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1-1 * Fri Jun 24 2005 Brendan O'Dea <bod@optus.net> 2.1.2-1
- 2.1.1 release, see /usr/share/doc/l2tpns-2.1.1/Changes - 2.1.2 release, see /usr/share/doc/l2tpns-2.1.2/Changes