X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f764cfffe6c453f11d6d850d002df071097cc23f..439dc534eb2edc6dfc86cc281cb920e27ccb7df2:/radius.c?ds=inline

diff --git a/radius.c b/radius.c
index a90fe13..ea3597f 100644
--- a/radius.c
+++ b/radius.c
@@ -1,5 +1,6 @@
 // L2TPNS Radius Stuff
-// $Id: radius.c,v 1.3 2004-05-24 04:27:11 fred_nerk Exp $
+
+char const *cvs_id_radius = "$Id: radius.c,v 1.9 2004-07-26 00:20:41 fred_nerk Exp $";
 
 #include <time.h>
 #include <stdio.h>
@@ -21,7 +22,6 @@ extern radiust *radius;
 extern sessiont *session;
 extern tunnelt *tunnel;
 extern u32 sessionid;
-extern struct Tstats *_statistics;
 extern struct configt *config;
 extern int *radfds;
 
@@ -46,7 +46,7 @@ void initrad(void)
 	for (i = 0; i < config->num_radfds; i++)
 	{
 		int flags;
-		if (!radfds[i]) radfds[i] = socket(AF_INET, SOCK_DGRAM, UDP);
+		if (!radfds[i]) radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 		flags = fcntl(radfds[i], F_GETFL, 0);
 		fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
 	}
@@ -58,43 +58,53 @@ void radiusclear(u16 r, sessionidt s)
 	memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL;
 }
 
-int next_radius_id = 1;
 
-static u16 new_radius()
+static u16 get_free_radius()
 {
-	u16 i;
-	int loops = 0;
-	for (i = next_radius_id; ; i = (i + 1) % MAXRADIUS)
+	int count;
+	static u32 next_radius_id = 0;
+
+	for (count = MAXRADIUS; count > 0 ; --count)
 	{
-		if (radius[i].state == RADIUSNULL)
-		{
-			next_radius_id = (next_radius_id + 1) % MAXRADIUS;
-			return i;
-		}
-		if (next_radius_id == i)
+		++next_radius_id;		// Find the next ID to check.
+		if (next_radius_id >= MAXRADIUS)
+			next_radius_id = 1;
+
+		if (radius[next_radius_id].state == RADIUSNULL)
 		{
-			if (++loops == 2)
-			{
-				log(0, 0, 0, 0, "Can't find a free radius session! This is very bad!\n");
-				return 0;
-			}
+			return next_radius_id;
 		}
 	}
+
+	log(0, 0, 0, 0, "Can't find a free radius session! This is very bad!\n");
+	return 0;
 }
 
 u16 radiusnew(sessionidt s)
 {
-	u16 r;
-	if (!(r = new_radius()))
+	u16 r = session[s].radius;
+
+	/* re-use */
+	if (r)
+	{
+		log(3, 0, s, session[s].tunnel, "Re-used radius %d\n", r);
+		return r;
+	}
+
+	if (!(r = get_free_radius()))
 	{
 		log(1, 0, s, session[s].tunnel, "No free RADIUS sessions\n");
 		STAT(radius_overflow);
 		return 0;
 	};
+
 	memset(&radius[r], 0, sizeof(radius[r]));
 	session[s].radius = r;
 	radius[r].session = s;
 	radius[r].state = RADIUSWAIT;
+	radius[r].retry = TIME + 1200; // Wait at least 120 seconds to re-claim this.
+
+	log(3,0,s, session[s].tunnel, "Allocated radius %d\n", r);
 	return r;
 }
 
@@ -107,9 +117,9 @@ void radiussend(u16 r, u8 state)
 	int pl;
 	u8 *p;
 	sessionidt s;
-#ifdef STAT_CALLS
-	STAT(call_radiussend);
-#endif
+
+	CSTAT(call_radiussend);
+
 	s = radius[r].session;
 	if (!config->numradiusservers)
 	{
@@ -335,7 +345,14 @@ void radiussend(u16 r, u8 state)
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 	*(u32 *) & addr.sin_addr = config->radiusserver[(radius[r].try - 1) % config->numradiusservers];
-	addr.sin_port = htons((state == RADIUSAUTH) ? RADPORT : RADAPORT);
+	{
+	    // get radius port
+	    u16	port = config->radiusport[(radius[r].try - 1) % config->numradiusservers];
+	    // no need to define the accounting port for itself:
+	    //  the accounting port is as far as I know always one more
+	    //  than the auth port    JK 20040713
+	    addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
+	}
 
 	log_hex(5, "RADIUS Send", b, (p - b));
 	sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
@@ -352,9 +369,14 @@ void processrad(u8 *buf, int len, char socket_index)
 	hasht hash;
 	u8 routes = 0;
 
-#ifdef STAT_CALLS
-	STAT(call_processrad);
-#endif
+	int r_code, r_id ; // Radius code.
+
+	r_code = buf[0]; // First byte in radius packet.
+	r_id = buf[1]; // radius reply indentifier.
+
+
+	CSTAT(call_processrad);
+
 	log_hex(5, "RADIUS Response", buf, len);
 	if (len < 20 || len < ntohs(*(u16 *) (buf + 2)))
 	{
@@ -362,10 +384,10 @@ void processrad(u8 *buf, int len, char socket_index)
 		return ;
 	}
 	len = ntohs(*(u16 *) (buf + 2));
-	r = socket_index | (buf[1] << RADIUS_SHIFT);
+	r = socket_index | (r_id << RADIUS_SHIFT);
 	s = radius[r].session;
-	log(3, 0, s, session[s].tunnel, "Received %s, radius %d response for session %u\n",
-			radius_states[radius[r].state], r, s);
+	log(3, 0, s, session[s].tunnel, "Received %s, radius %d response for session %u (code %d, id %d)\n",
+			radius_states[radius[r].state], r, s, r_code, r_id);
 	if (!s && radius[r].state != RADIUSSTOP)
 	{
 		log(1, 0, s, session[s].tunnel, "   Unexpected RADIUS response\n");
@@ -386,16 +408,15 @@ void processrad(u8 *buf, int len, char socket_index)
 	do {
 		if (memcmp(hash, buf + 4, 16))
 		{
-			log(0, 0, s, session[s].tunnel, "   Incorrect auth on RADIUS response\n");
-			radius[r].state = RADIUSWAIT;
-			break;
+			log(0, 0, s, session[s].tunnel, "   Incorrect auth on RADIUS response!! (wrong secret in radius config?)\n");
+			return; // Do nothing. On timeout, it will try the next radius server.
 		}
 		if ((radius[r].state == RADIUSAUTH && *buf != 2 && *buf != 3) ||
 			((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP) && *buf != 5))
 		{
 			log(1, 0, s, session[s].tunnel, "   Unexpected RADIUS response %d\n", *buf);
-			radius[r].state = RADIUSWAIT;
-			break;
+			return; // We got something we didn't expect. Let the timeouts take
+				// care off finishing the radius session if that's really correct.
 		}
 		if (radius[r].state == RADIUSAUTH)
 		{
@@ -404,8 +425,10 @@ void processrad(u8 *buf, int len, char socket_index)
 			if (radius[r].chap)
 			{
 				// CHAP
-				u8 *p = makeppp(b, 0, 0, t, s, PPPCHAP);
-
+				u8 *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+				if (!p) {
+					return;	// Abort!
+				}
 				{
 					struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPCHAP };
 					run_plugins(PLUGIN_POST_AUTH, &packet);
@@ -422,7 +445,9 @@ void processrad(u8 *buf, int len, char socket_index)
 			else
 			{
 				// PAP
-				u8 *p = makeppp(b, 0, 0, t, s, PPPPAP);
+				u8 *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
+				if (!p)
+					return;		// Abort!
 
 				{
 					struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPPAP };
@@ -453,17 +478,18 @@ void processrad(u8 *buf, int len, char socket_index)
 						// Statically assigned address
 						log(3, 0, s, session[s].tunnel, "   Radius reply contains IP address %s\n", inet_toa(*(u32 *) (p + 2)));
 						session[s].ip = ntohl(*(u32 *) (p + 2));
+						session[s].ip_pool_index = -1;
 					}
 					else if (*p == 135)
 					{
 						// DNS address
-						log(3, 0, s, session[s].tunnel, "   Radius reply contains primary DNS address %s\n", inet_toa(ntohl(*(u32 *) (p + 2))));
+						log(3, 0, s, session[s].tunnel, "   Radius reply contains primary DNS address %s\n", inet_toa(*(u32 *) (p + 2)));
 						session[s].dns1 = ntohl(*(u32 *) (p + 2));
 					}
 					else if (*p == 136)
 					{
 						// DNS address
-						log(3, 0, s, session[s].tunnel, "   Radius reply contains secondary DNS address %s\n", inet_toa(ntohl(*(u32 *) (p + 2))));
+						log(3, 0, s, session[s].tunnel, "   Radius reply contains secondary DNS address %s\n", inet_toa(*(u32 *) (p + 2)));
 						session[s].dns2 = ntohl(*(u32 *) (p + 2));
 					}
 					else if (*p == 22)
@@ -503,11 +529,11 @@ void processrad(u8 *buf, int len, char socket_index)
 						{
 							log(1, 0, s, session[s].tunnel, "   Too many routes\n");
 						}
-						else
+						else if (ip)
 						{
 							char *ips, *masks;
-							ips = strdup(inet_toa(ip));
-							masks = strdup(inet_toa(mask));
+							ips = strdup(inet_toa(htonl(ip)));
+							masks = strdup(inet_toa(htonl(mask)));
 							log(3, 0, s, session[s].tunnel, "   Radius reply contains route for %s/%s\n", ips, masks);
 							free(ips);
 							free(masks);
@@ -564,19 +590,10 @@ void processrad(u8 *buf, int len, char socket_index)
 			else if (*buf == 3)
 			{
 				log(2, 0, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);
+//FIXME: We should tear down the session here!
 				break;
 			}
 
-			// Check for Assign-IP-Address
-			if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
-			{
-				assign_ip_address(s);
-				if (session[s].ip)
-					log(3, 0, s, t, "   No IP allocated by radius. Assigned %s from pool\n",
-							inet_toa(htonl(session[s].ip)));
-				else
-					log(0, 0, s, t, "   No IP allocated by radius. The IP address pool is FULL!\n");
-			}
 			if (!session[s].dns1 && config->default_dns1)
 			{
 				session[s].dns1 = htonl(config->default_dns1);
@@ -588,21 +605,15 @@ void processrad(u8 *buf, int len, char socket_index)
 				log(3, 0, s, t, "   Sending dns2 = %s\n", inet_toa(config->default_dns2));
 			}
 
-			if (session[s].ip)
-			{
-				// Valid Session, set it up
-				session[s].sid = 0;
-				sessionsetup(t, s, routes);
-			}
-			else
-			{
-				log(0, 0, s, t, "   End of processrad(), but no valid session exists.\n");
-				sessionkill(s, "Can't create valid session");
-			}
+			// Valid Session, set it up
+			session[s].sid = 0;
+			sessionsetup(t, s);
 		}
 		else
 		{
-			log(3, 0, s, t, "   RADIUS response in state %s\n", radius_states[radius[r].state]);
+				// An ack for a stop or start record.
+			log(3, 0, s, t, "   RADIUS accounting ack recv in state %s\n", radius_states[radius[r].state]);
+			break;
 		}
 	} while (0);
 
@@ -615,9 +626,9 @@ void radiusretry(u16 r)
 {
 	sessionidt s = radius[r].session;
 	tunnelidt t = 0;
-#ifdef STAT_CALLS
-	STAT(call_radiusretry);
-#endif
+
+	CSTAT(call_radiusretry);
+
 	if (s)
 		t = session[s].tunnel;
 	radius[r].retry = backoff(radius[r].try + 1);
@@ -660,6 +671,6 @@ void radius_clean()
 				|| !session[radius[i].session].opened
 				|| session[radius[i].session].die
 				|| session[radius[i].session].tunnel == 0)
-			radiusclear(i, 0);
+			radiusclear(i, radius[i].session);
 	}
 }