// 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.8 2004/07/11 07:57:35 bodea Exp $";
#include <time.h>
#include <stdio.h>
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);
}
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; // Find the next ID to check.
+ if (next_radius_id >= MAXRADIUS)
+ next_radius_id = 1;
+
+ if (radius[next_radius_id].state == RADIUSNULL)
{
- next_radius_id = (next_radius_id + 1) % MAXRADIUS;
- return i;
- }
- if (next_radius_id == i)
- {
- 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;
int pl;
u8 *p;
sessionidt s;
-#ifdef STAT_CALLS
- STAT(call_radiussend);
-#endif
+
+ CSTAT(call_radiussend);
+
s = radius[r].session;
if (!config->numradiusservers)
{
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)))
{
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)
{
{
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);
|| !session[radius[i].session].opened
|| session[radius[i].session].die
|| session[radius[i].session].tunnel == 0)
- radiusclear(i, 0);
+ radiusclear(i, radius[i].session);
}
}