From 32ab43cf2988574c4485685889ec6c4139e7daf2 Mon Sep 17 00:00:00 2001 From: bodea Date: Mon, 18 Dec 2006 12:05:36 +0000 Subject: [PATCH] don't send interim records before session start (Daryl Tester) --- Changes | 3 ++- l2tpns.c | 5 +++-- l2tpns.spec | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index 0c6fc40..81a3337 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -* Tue Dec 5 2006 Brendan O'Dea 2.2.0 +* Mon Dec 18 2006 Brendan O'Dea 2.2.0 - Only poll clifd if successfully bound. - Add "Practical VPNs" document from Liran Tal as Docs/vpn . - Add Multilink support from Khaled Al Hamwi. @@ -14,6 +14,7 @@ vendor-specific Ascend formats. - Security [CVE-2006-5873]: Rhys Kidd identified a vulnerability in the handling of heartbeat packets. Drop oversize heartbeat packets. +- Don't send interim records before session start (Daryl Tester). * Tue Apr 18 2006 Brendan O'Dea 2.1.18 - Don't shutdown on TerminateReq, wait for CDN. diff --git a/l2tpns.c b/l2tpns.c index 0ed0337..545a3cd 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.171 2006/08/02 13:35:39 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.172 2006/12/18 12:05:36 bodea Exp $"; #include #include @@ -3311,7 +3311,8 @@ static void regular_cleanups(double period) if (config->radius_accounting && config->radius_interim > 0 && session[s].ip && !session[s].walled_garden && !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 + && session[s].flags & SESSION_STARTED) { int rad = radiusnew(s); if (!rad) diff --git a/l2tpns.spec b/l2tpns.spec index dc03660..021a848 100644 --- a/l2tpns.spec +++ b/l2tpns.spec @@ -43,5 +43,5 @@ rm -rf %{buildroot} %attr(644,root,root) /usr/share/man/man[58]/* %changelog -* Tue Dec 5 2006 Brendan O'Dea 2.2.0-1 +* Mon Dec 18 2006 Brendan O'Dea 2.2.0-1 - 2.2.0 release, see /usr/share/doc/l2tpns-2.2.0/Changes -- 2.20.1