// L2TPNS Radius Stuff
-char const *cvs_id_radius = "$Id: radius.c,v 1.53 2006/08/02 12:54:45 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.56 2009/12/08 14:49:28 bodea Exp $";
#include <time.h>
#include <stdio.h>
return;
}
- if (state != RADIUSAUTH && !config->radius_accounting)
+ if (state != RADIUSAUTH && state != RADIUSJUSTAUTH && !config->radius_accounting)
{
// Radius accounting is turned off
radiusclear(r, s);
{
if (s)
{
- if (state == RADIUSAUTH)
+ if (state == RADIUSAUTH || state == RADIUSJUSTAUTH)
sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
else
{
switch (state)
{
case RADIUSAUTH:
+ case RADIUSJUSTAUTH:
b[0] = AccessRequest; // access request
break;
case RADIUSSTART:
strcpy((char *) p + 2, session[s].user);
p += p[1];
}
- if (state == RADIUSAUTH)
+ if (state == RADIUSAUTH || state == RADIUSJUSTAUTH)
{
if (radius[r].chap)
{
*p = 6; // Service-Type
p[1] = 6;
- *(uint32_t *) (p + 2) = htonl(2); // Framed-User
+ *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 8 : 2)); // Authenticate only or Framed-User respectevily
p += p[1];
*p = 7; // Framed-Protocol
- p[1] = 6;
- *(uint32_t *) (p + 2) = htonl(1); // PPP
+ p[1] = htonl((state == RADIUSJUSTAUTH ? 0 : 6));
+ *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 0 : 1)); // PPP
p += p[1];
if (session[s].ip)
int r;
for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
{
- int width = 32;
- if (session[s].route[r].mask)
- {
- int mask = session[s].route[r].mask;
- while (!(mask & 1))
- {
- width--;
- mask >>= 1;
- }
- }
-
*p = 22; // Framed-Route
p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
fmtaddr(htonl(session[s].route[r].ip), 0),
- width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+ session[s].route[r].prefixlen,
+ fmtaddr(htonl(session[s].ip), 1)) + 2;
p += p[1];
}
// All AVpairs added
*(uint16_t *) (b + 2) = htons(p - b);
- if (state != RADIUSAUTH)
+ if (state != RADIUSAUTH && state != RADIUSJUSTAUTH)
{
// Build auth for accounting packet
calc_auth(b, p - b, zero, b + 4);
// get radius port
uint16_t port = config->radiusport[(radius[r].try - 1) % config->numradiusservers];
// assume RADIUS accounting port is the authentication port +1
- addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
+ addr.sin_port = htons((state == RADIUSAUTH || state == RADIUSJUSTAUTH) ? port : port+1);
}
LOG_HEX(5, "RADIUS Send", b, (p - b));
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n");
return;
}
- if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART
+ if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSJUSTAUTH && radius[r].state != RADIUSSTART
&& radius[r].state != RADIUSSTOP && radius[r].state != RADIUSINTERIM)
{
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n");
return; // Do nothing. On timeout, it will try the next radius server.
}
- if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) ||
+ if (((radius[r].state == RADIUSAUTH ||radius[r].state == RADIUSJUSTAUTH) && r_code != AccessAccept && r_code != AccessReject) ||
((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP || radius[r].state == RADIUSINTERIM) && r_code != AccountingResponse))
{
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response %s\n", radius_code(r_code));
// care off finishing the radius session if that's really correct.
}
- if (radius[r].state == RADIUSAUTH)
+ if (radius[r].state == RADIUSAUTH || radius[r].state == RADIUSJUSTAUTH)
{
// run post-auth plugin
struct param_post_auth packet = {
uint8_t *e = buf + len;
for (; p + 2 <= e && p[1] && p + p[1] <= e; p += p[1])
{
+ if (*p == 26 && p[1] >= 7)
+ {
+ // Vendor-Specific Attribute
+ uint32_t vendor = ntohl(*(int *)(p + 2));
+ uint8_t attrib = *(p + 6);
+ int attrib_length = *(p + 7) - 2;
+
+ LOG(4, s, session[s].tunnel, " Radius reply contains Vendor-Specific. Vendor=%u Attrib=%u Length=%d\n", vendor, attrib, attrib_length);
+ if (vendor == 9 && attrib == 1) // Cisco-AVPair
+ {
+ if (attrib_length < 0) continue;
+ LOG(3, s, session[s].tunnel, " Cisco-AVPair value: %.*s\n",
+ attrib_length, p + 8);
+
+ handle_avpair(s, p + 8, attrib_length);
+ continue;
+ }
+ else if (vendor == 529 && attrib >= 135 && attrib <= 136) // Ascend
+ {
+ // handle old-format ascend DNS attributes below
+ p += 6;
+ }
+ else
+ {
+ LOG(3, s, session[s].tunnel, " Unknown vendor-specific\n");
+ continue;
+ }
+ }
+
if (*p == 8)
{
// Framed-IP-Address
LOG(3, s, session[s].tunnel, " Radius reply contains primary DNS address %s\n",
fmtaddr(htonl(session[s].dns1), 0));
}
- else if (*p == 27)
- {
- // Session timeout
- if (p[1] < 6) {
- LOG(2, s, session[s].tunnel, "Error: Received Session timeout with length %d < 6\n", p[1]);
- continue;
- }
-
- session[s].timeout = ntohl(*(uint32_t *) (p + 2));
- LOG(3, s, session[s].tunnel, " Radius reply contains Session timeout %d\n", session[s].timeout);
- if (!session[s].timeout)
- sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, TERM_SESSION_TIMEOUT);
- }
else if (*p == 136)
{
// DNS address
else if (*p == 22)
{
// Framed-Route
- in_addr_t ip = 0, mask = 0;
+ in_addr_t ip = 0;
uint8_t u = 0;
uint8_t bits = 0;
uint8_t *n = p + 2;
n++;
while (n < e && isdigit(*n))
bits = bits * 10 + *n++ - '0';
- mask = (( -1) << (32 - bits));
}
else if ((ip >> 24) < 128)
- mask = 0xFF0000;
+ bits = 8;
else if ((ip >> 24) < 192)
- mask = 0xFFFF0000;
+ bits = 16;
else
- mask = 0xFFFFFF00;
+ bits = 24;
if (routes == MAXROUTE)
{
}
else if (ip)
{
- LOG(3, s, session[s].tunnel, " Radius reply contains route for %s/%s\n",
- fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1));
+ LOG(3, s, session[s].tunnel, " Radius reply contains route for %s/%d\n",
+ fmtaddr(htonl(ip), 0), bits);
session[s].route[routes].ip = ip;
- session[s].route[routes].mask = mask;
+ session[s].route[routes].prefixlen = bits;
routes++;
}
}
else if (*p == 27)
{
// Session-Timeout
- uint32_t to = ntohl(*(uint32_t *)(p + 2));
-
- LOG(3, s, session[s].tunnel, " Radius reply contains Session-Timeout = %u\n", to);
- if (to > 0)
- {
- session[s].session_timeout = to;
- }
+ if (p[1] < 6) continue;
+ session[s].session_timeout = ntohl(*(uint32_t *)(p + 2));
+ LOG(3, s, session[s].tunnel, " Radius reply contains Session-Timeout = %u\n", session[s].session_timeout);
+ if(!session[s].session_timeout && config->kill_timedout_sessions)
+ sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, 0);
}
else if (*p == 28)
{
// Idle-Timeout
- uint32_t to = ntohl(*(uint32_t *)(p + 2));
-
- LOG(3, s, session[s].tunnel, " Radius reply contains Idle-Timeout = %u\n", to);
- if (to > 0)
- {
- session[s].idle_timeout = to;
- }
- }
- else if (*p == 26 && p[1] >= 7)
- {
- // Vendor-Specific Attribute
- uint32_t vendor = ntohl(*(int *)(p + 2));
- uint8_t attrib = *(p + 6);
- int attrib_length = *(p + 7) - 2;
-
- LOG(3, s, session[s].tunnel, " Radius reply contains Vendor-Specific. Vendor=%u Attrib=%u Length=%d\n", vendor, attrib, attrib_length);
- if (vendor != 9 || attrib != 1)
- {
- LOG(3, s, session[s].tunnel, " Unknown vendor-specific\n");
- continue;
- }
-
- if (attrib_length > 0)
- {
- LOG(3, s, session[s].tunnel, " Cisco-AVPair value: %.*s\n",
- attrib_length, p + 8);
-
- handle_avpair(s, p + 8, attrib_length);
- }
+ if (p[1] < 6) continue;
+ session[s].idle_timeout = ntohl(*(uint32_t *)(p + 2));
+ LOG(3, s, session[s].tunnel, " Radius reply contains Idle-Timeout = %u\n", session[s].idle_timeout);
}
else if (*p == 99)
{
sendchap(s, t);
break;
case RADIUSAUTH: // sending auth to RADIUS server
+ case RADIUSJUSTAUTH: // sending auth to RADIUS server
case RADIUSSTART: // sending start accounting to RADIUS server
case RADIUSSTOP: // sending stop accounting to RADIUS server
case RADIUSINTERIM: // sending interim accounting to RADIUS server
projects / l2tpns.git / blobdiff