projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fdn-mods'
[l2tpns.git]
/
radius.c
diff --git
a/radius.c
b/radius.c
index
f35e78d
..
4e67e63
100644
(file)
--- a/
radius.c
+++ b/
radius.c
@@
-1,6
+1,6
@@
// L2TPNS Radius Stuff
// L2TPNS Radius Stuff
-char const *cvs_id_radius = "$Id: radius.c,v 1.5
5 2006/08/02 14:17:30
bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.5
6 2009/12/08 14:49:28
bodea Exp $";
#include <time.h>
#include <stdio.h>
#include <time.h>
#include <stdio.h>
@@
-177,7
+177,7
@@
void radiussend(uint16_t r, uint8_t state)
return;
}
return;
}
- if (state != RADIUSAUTH && !config->radius_accounting)
+ if (state != RADIUSAUTH &&
state != RADIUSJUSTAUTH &&
!config->radius_accounting)
{
// Radius accounting is turned off
radiusclear(r, s);
{
// Radius accounting is turned off
radiusclear(r, s);
@@
-197,7
+197,7
@@
void radiussend(uint16_t r, uint8_t state)
{
if (s)
{
{
if (s)
{
- if (state == RADIUSAUTH)
+ if (state == RADIUSAUTH
|| state == RADIUSJUSTAUTH
)
sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
else
{
sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
else
{
@@
-219,6
+219,7
@@
void radiussend(uint16_t r, uint8_t state)
switch (state)
{
case RADIUSAUTH:
switch (state)
{
case RADIUSAUTH:
+ case RADIUSJUSTAUTH:
b[0] = AccessRequest; // access request
break;
case RADIUSSTART:
b[0] = AccessRequest; // access request
break;
case RADIUSSTART:
@@
-239,7
+240,7
@@
void radiussend(uint16_t r, uint8_t state)
strcpy((char *) p + 2, session[s].user);
p += p[1];
}
strcpy((char *) p + 2, session[s].user);
p += p[1];
}
- if (state == RADIUSAUTH)
+ if (state == RADIUSAUTH
|| state == RADIUSJUSTAUTH
)
{
if (radius[r].chap)
{
{
if (radius[r].chap)
{
@@
-380,12
+381,12
@@
void radiussend(uint16_t r, uint8_t state)
*p = 6; // Service-Type
p[1] = 6;
*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 += 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)
p += p[1];
if (session[s].ip)
@@
-401,21
+402,11
@@
void radiussend(uint16_t r, uint8_t state)
int r;
for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
{
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),
*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];
}
p += p[1];
}
@@
-462,7
+453,7
@@
void radiussend(uint16_t r, uint8_t state)
// All AVpairs added
*(uint16_t *) (b + 2) = htons(p - b);
// 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);
{
// Build auth for accounting packet
calc_auth(b, p - b, zero, b + 4);
@@
-475,7
+466,7
@@
void radiussend(uint16_t r, uint8_t state)
// get radius port
uint16_t port = config->radiusport[(radius[r].try - 1) % config->numradiusservers];
// assume RADIUS accounting port is the authentication port +1
// 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_HEX(5, "RADIUS Send", b, (p - b));
@@
-558,7
+549,7
@@
void processrad(uint8_t *buf, int len, char socket_index)
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n");
return;
}
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 != RADIUS
JUSTAUTH && radius[r].state != RADIUS
START
&& radius[r].state != RADIUSSTOP && radius[r].state != RADIUSINTERIM)
{
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n");
&& radius[r].state != RADIUSSTOP && radius[r].state != RADIUSINTERIM)
{
LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n");
@@
-573,7
+564,7
@@
void processrad(uint8_t *buf, int len, char socket_index)
return; // Do nothing. On timeout, it will try the next radius server.
}
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));
((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));
@@
-581,7
+572,7
@@
void processrad(uint8_t *buf, int len, char socket_index)
// care off finishing the radius session if that's really correct.
}
// 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 = {
{
// run post-auth plugin
struct param_post_auth packet = {
@@
-695,7
+686,7
@@
void processrad(uint8_t *buf, int len, char socket_index)
else if (*p == 22)
{
// Framed-Route
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;
uint8_t u = 0;
uint8_t bits = 0;
uint8_t *n = p + 2;
@@
-717,14
+708,13
@@
void processrad(uint8_t *buf, int len, char socket_index)
n++;
while (n < e && isdigit(*n))
bits = bits * 10 + *n++ - '0';
n++;
while (n < e && isdigit(*n))
bits = bits * 10 + *n++ - '0';
- mask = (( -1) << (32 - bits));
}
else if ((ip >> 24) < 128)
}
else if ((ip >> 24) < 128)
-
mask = 0xFF0000
;
+
bits = 8
;
else if ((ip >> 24) < 192)
else if ((ip >> 24) < 192)
-
mask = 0xFFFF0000
;
+
bits = 16
;
else
else
-
mask = 0xFFFFFF00
;
+
bits = 24
;
if (routes == MAXROUTE)
{
if (routes == MAXROUTE)
{
@@
-732,11
+722,11
@@
void processrad(uint8_t *buf, int len, char socket_index)
}
else if (ip)
{
}
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].ip = ip;
- session[s].route[routes].
mask = mask
;
+ session[s].route[routes].
prefixlen = bits
;
routes++;
}
}
routes++;
}
}
@@
-783,6
+773,8
@@
void processrad(uint8_t *buf, int len, char socket_index)
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 (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)
{
}
else if (*p == 28)
{
@@
-869,6
+861,7
@@
void radiusretry(uint16_t r)
sendchap(s, t);
break;
case RADIUSAUTH: // sending auth to RADIUS server
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
case RADIUSSTART: // sending start accounting to RADIUS server
case RADIUSSTOP: // sending stop accounting to RADIUS server
case RADIUSINTERIM: // sending interim accounting to RADIUS server