X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/845bb1f376be7666923e4ce0798f3801ea84b910..d2848cebc450b4d1e66a4b7bf290167f2870b618:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index a544134..3b61951 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,8 +4,6 @@
 // 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.173 2009-12-08 14:49:28 bodea Exp $";
-
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
@@ -1730,6 +1728,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
 		LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);
 		run_plugins(PLUGIN_KILL_SESSION, &data);
+		session[s].die = TIME + 150; // Clean up in 15 seconds
 	}
 
 	if (session[s].ip && !walled_garden && !session[s].die)
@@ -1832,9 +1831,6 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		controladd(c, session[s].far, session[s].tunnel); // send the message
 	}
 
-	if (!session[s].die)
-		session[s].die = TIME + 150; // Clean up in 15 seconds
-
 	// update filter refcounts
 	if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--;
 	if (session[s].filter_out) ip_filters[session[s].filter_out - 1].used--;
@@ -1930,8 +1926,9 @@ void sessionkill(sessionidt s, char *reason)
 		return;
 	}
 
-	session[s].die = TIME;
-	sessionshutdown(s, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
+	if (!session[s].die)
+		sessionshutdown(s, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
+
 	if (sess_local[s].radius)
 		radiusclear(sess_local[s].radius, s); // cant send clean accounting data, session is killed
 
@@ -2687,9 +2684,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
@@ -3032,7 +3031,7 @@ static void regular_cleanups(double period)
 			if (tunnel[t].retry <= TIME)
 			{
 				controlt *c = tunnel[t].controls;
-				uint8_t w = tunnel[t].window;
+				uint16_t w = tunnel[t].window;
 				tunnel[t].try++; // another try
 				if (tunnel[t].try > 5)
 					tunnelkill(t, "Timeout on control message"); // game over