From: Brendan O'Dea <bod@optus.net>
Date: Thu, 25 Mar 2010 05:24:23 +0000 (+0000)
Subject: Apply patch from Cyril Elkaim to fix an issue with MacOS.
X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1^2~6
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/97119ee512f1cfa772abbd76fa83271ea26bdb4b

Apply patch from Cyril Elkaim to fix an issue with MacOS.
---

diff --git a/Changes b/Changes
index b1cd057..0740ab8 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
-* Mon Jan 11 2010 Brendan O'Dea <bod@optus.net> 2.2.x
+* Thu Mar 25 2010 Brendan O'Dea <bod@optus.net> 2.2.x
 - Apply MLPPP patch from Muhammad Tayseer Alquoatli.
 - Apply patch from Michael O to avoid sending multiple CDNs.
+- Apply patch from Cyril Elkaim to fix an issue with MacOS.
 
 * Mon Dec 18 2006 Brendan O'Dea <bod@optus.net> 2.2.0
 - Only poll clifd if successfully bound.
diff --git a/l2tpns.c b/l2tpns.c
index a599a50..84acb68 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.174 2010-01-09 13:33:41 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.175 2010-03-25 05:24:23 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2686,9 +2686,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 					break;
 				case 2:       // SCCRP
 					tunnel[t].state = TUNNELOPEN;
+					tunnel[t].lastrec = time_now;
 					break;
 				case 3:       // SCCN
 					tunnel[t].state = TUNNELOPEN;
+					tunnel[t].lastrec = time_now;
 					controlnull(t); // ack
 					break;
 				case 4:       // StopCCN