From: Brendan O'Dea <bod@optus.net>
Date: Tue, 18 Oct 2005 07:19:28 +0000 (+0000)
Subject: fix LCP Echo frequency
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~88
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/4b3b34b994a60ba3f89502e85d8cbe80c9da26f3

fix LCP Echo frequency
---

diff --git a/Changes b/Changes
index f769dba..220ba22 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
-* Wed Oct 12 2005 Brendan O'Dea <bod@optus.net> 2.1.10
+* Tue Oct 18 2005 Brendan O'Dea <bod@optus.net> 2.1.10
 - Add scripts/l2tpns-capture.
+- Fix LCP Echo frequency.
 
 * Tue Oct 11 2005 Brendan O'Dea <bod@optus.net> 2.1.9
 - Fix Calling-Station-Id in RADIUS accounting records (Slobodan Tomic).
diff --git a/l2tpns.c b/l2tpns.c
index 0f50b64..994116f 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.144 2005-10-11 09:04:53 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.145 2005-10-18 07:19:28 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2932,7 +2932,8 @@ static void regular_cleanups(double period)
 		}
 
 		// No data in ECHO_TIMEOUT seconds, send LCP ECHO
-		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
+		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= ECHO_TIMEOUT) &&
+			(time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
 		{
 			uint8_t b[MAXETHER];
 
@@ -2947,6 +2948,7 @@ static void regular_cleanups(double period)
 			LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
 					(int)(time_now - session[s].last_packet));
 			tunnelsend(b, 24, session[s].tunnel); // send it
+			sess_local[s].last_echo = time_now;
 			s_actions++;
 		}
 
diff --git a/l2tpns.h b/l2tpns.h
index e901d04..79f1c85 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.95 2005-10-12 07:16:13 bodea Exp $
+// $Id: l2tpns.h,v 1.96 2005-10-18 07:19:29 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -307,6 +307,9 @@ typedef struct
 
 	// interim RADIUS
 	time_t last_interim;
+
+	// last LCP Echo
+	time_t last_echo;
 } sessionlocalt;
 
 #define	SESSIONPFC	1	// PFC negotiated flags
diff --git a/l2tpns.spec b/l2tpns.spec
index 3721f92..de1cc46 100644
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
-* Wed Oct 12 2005 Brendan O'Dea <bod@optus.net> 2.1.10-1
+* Tue Oct 18 2005 Brendan O'Dea <bod@optus.net> 2.1.10-1
 - 2.1.10 release, see /usr/share/doc/l2tpns-2.1.10/Changes