X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/7d193dfb51ba1e81499985d23e5880740401bf39..0ae51eec5d1a7e20ac6ca9a9463af4f37e45a46c:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index a55854a..70d0c70 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.73.2.6 2005/04/01 06:37:19 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.73.2.9 2005/05/16 04:51:42 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -1117,7 +1117,6 @@ void sessionshutdown(sessionidt s, char *reason)
 			if (!(r = radiusnew(s)))
 			{
 				LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
-				STAT(radius_overflow);
 			}
 			else
 			{
@@ -1189,6 +1188,12 @@ void sendipcp(tunnelidt t, sessionidt s)
 	if (!r)
 		r = radiusnew(s);
 
+	if (!r)
+	{
+		sessionshutdown(s, "No free RADIUS sessions for IPCP");
+		return;
+	}
+
 	if (radius[r].state != RADIUSIPCP)
 	{
 		radius[r].state = RADIUSIPCP;
@@ -1207,7 +1212,7 @@ void sendipcp(tunnelidt t, sessionidt s)
 	if (!q) return;
 
 	*q = ConfigReq;
-	q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
+	q[1] = r >> RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
 	*(uint16_t *) (q + 2) = htons(10);
 	q[4] = 3;
 	q[5] = 6;
@@ -1219,6 +1224,17 @@ void sendipcp(tunnelidt t, sessionidt s)
 	session[s].flags &= ~SF_IPCP_ACKED;	// Clear flag.
 }
 
+static void sessionclear(sessionidt s)
+{
+	memset(&session[s], 0, sizeof(session[s]));
+	memset(&sess_local[s], 0, sizeof(sess_local[s]));
+	memset(&cli_session_actions[s], 0, sizeof(cli_session_actions[s]));
+
+	session[s].tunnel = T_FREE;	// Mark it as free.
+	session[s].next = sessionfree;
+	sessionfree = s;
+}
+
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
@@ -1240,12 +1256,7 @@ void sessionkill(sessionidt s, char *reason)
 		radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
 
 	LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
-
-	memset(&session[s], 0, sizeof(session[s]));
-	session[s].tunnel = T_FREE;	// Mark it as free.
-	session[s].next = sessionfree;
-	sessionfree = s;
-	cli_session_actions[s].action = 0;
+	sessionclear(s);
 	cluster_send_session(s);
 }
 
@@ -1847,7 +1858,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 					if (!sessionfree)
 					{
 						STAT(session_overflow);
-						LOG(1, 0, t, "No free sessions");
+						LOG(1, 0, t, "No free sessions\n");
 						return;
 					}
 					else
@@ -1866,7 +1877,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 						if (!(r = radiusnew(s)))
 						{
 							LOG(1, s, t, "No free RADIUS sessions for ICRQ\n");
-							sessionkill(s, "no free RADIUS sesions");
+							sessionclear(s);
 							return;
 						}
 
@@ -3647,7 +3658,7 @@ static void update_config()
 	if (!config->numradiusservers)
 		LOG(0, 0, 0, "No RADIUS servers defined!\n");
 
-	config->num_radfds = 2 << RADIUS_SHIFT;
+	config->num_radfds = 1 << RADIUS_SHIFT;
 
 	// Update plugins
 	for (i = 0; i < MAXPLUGINS; i++)