X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/ed90ea49e025e0c8083f9d98768d870e6a880f13..e8c395011302d085135535b2bf7ebd04d11f137f:/radius.c

diff --git a/radius.c b/radius.c
index 2a2db48..5634775 100644
--- a/radius.c
+++ b/radius.c
@@ -1,5 +1,6 @@
 // L2TPNS Radius Stuff
-// $Id: radius.c,v 1.4 2004/06/23 03:52:24 fred_nerk Exp $
+
+char const *cvs_id_radius = "$Id: radius.c,v 1.10 2004/09/02 04:18:07 fred_nerk Exp $";
 
 #include <time.h>
 #include <stdio.h>
@@ -45,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);
 	}
@@ -57,44 +58,51 @@ 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 = config->current_time + 1200; // Wait at least 120 seconds to re-claim this.
+	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;
@@ -109,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)
 	{
@@ -337,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));
@@ -359,9 +374,9 @@ void processrad(u8 *buf, int len, char socket_index)
 	r_code = buf[0]; // First byte in radius packet.
 	r_id = buf[1]; // radius reply indentifier.
 
-#ifdef STAT_CALLS
-	STAT(call_processrad);
-#endif
+
+	CSTAT(call_processrad);
+
 	log_hex(5, "RADIUS Response", buf, len);
 	if (len < 20 || len < ntohs(*(u16 *) (buf + 2)))
 	{
@@ -394,20 +409,14 @@ void processrad(u8 *buf, int len, char socket_index)
 		if (memcmp(hash, buf + 4, 16))
 		{
 			log(0, 0, s, session[s].tunnel, "   Incorrect auth on RADIUS response!! (wrong secret in radius config?)\n");
-//			radius[r].state = RADIUSWAIT;
-
 			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);
-
 			return; // We got something we didn't expect. Let the timeouts take
 				// care off finishing the radius session if that's really correct.
-// old code. I think incorrect. --mo
-//			radius[r].state = RADIUSWAIT;
-//			break; // Finish the radius sesssion.
 		}
 		if (radius[r].state == RADIUSAUTH)
 		{
@@ -597,7 +606,7 @@ void processrad(u8 *buf, int len, char socket_index)
 			}
 
 			// Valid Session, set it up
-			session[s].sid = 0;
+			session[s].unique_id = 0;
 			sessionsetup(t, s);
 		}
 		else
@@ -617,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);
@@ -662,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);
 	}
 }