X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/3aa4eda8b1e0c4abc04439affe850d33648c7472..30b64bb9f99720d8886057caeb519f2524f1b4cf:/radius.c?ds=sidebyside diff --git a/radius.c b/radius.c index ee364b2..38b1f22 100644 --- a/radius.c +++ b/radius.c @@ -1,5 +1,6 @@ // L2TPNS Radius Stuff -// $Id: radius.c,v 1.1 2003/12/16 07:07:39 fred_nerk Exp $ + +char const *cvs_id_radius = "$Id: radius.c,v 1.20.2.2 2005/05/03 05:10:52 bodea Exp $"; #include #include @@ -7,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -16,22 +18,14 @@ #include "plugin.h" #include "util.h" -extern char *radiussecret; extern radiust *radius; extern sessiont *session; extern tunnelt *tunnel; -extern ipt radiusserver[MAXRADSERVER]; // radius servers -extern u32 sessionid; -extern u8 radiusfree; -extern int radfd; -extern u8 numradiusservers; -extern char debug; -extern unsigned long default_dns1, default_dns2; -extern struct Tstats *_statistics; -extern int radius_accounting; -extern uint32_t bind_address; - -const char *radius_state(int state) +extern configt *config; +extern int *radfds; +extern ip_filtert *ip_filters; + +static const char *radius_state(int state) { static char *tmp = NULL; int i; @@ -46,60 +40,99 @@ const char *radius_state(int state) // Set up socket for radius requests void initrad(void) { - radfd = socket(AF_INET, SOCK_DGRAM, UDP); + int i; + LOG(3, 0, 0, "Creating %d sockets for RADIUS queries\n", config->num_radfds); + radfds = calloc(sizeof(int), config->num_radfds); + for (i = 0; i < config->num_radfds; i++) + { + int flags; + radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + flags = fcntl(radfds[i], F_GETFL, 0); + fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK); + } } -void radiusclear(u8 r, sessionidt s) +void radiusclear(uint16_t r, sessionidt s) { - radius[r].state = RADIUSNULL; if (s) session[s].radius = 0; - memset(&radius[r], 0, sizeof(radius[r])); - radius[r].next = radiusfree; - radiusfree = r; + memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL; +} + + +static uint16_t get_free_radius() +{ + int count; + static uint32_t next_radius_id = 0; + + for (count = MAXRADIUS; count > 0 ; --count) + { + ++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) + { + return next_radius_id; + } + } + + LOG(0, 0, 0, "Can't find a free radius session! This is very bad!\n"); + return 0; } -u8 radiusnew(sessionidt s) +uint16_t radiusnew(sessionidt s) { - u8 r; - if (!radiusfree) + uint16_t r = session[s].radius; + + /* re-use */ + if (r) { - log(1, 0, s, session[s].tunnel, "No free RADIUS sessions\n"); + LOG(3, s, session[s].tunnel, "Re-used radius %d\n", r); + return r; + } + + if (!(r = get_free_radius())) + { + LOG(1, s, session[s].tunnel, "No free RADIUS sessions\n"); STAT(radius_overflow); return 0; }; - r = radiusfree; - session[s].radius = r; - radiusfree = radius[r].next; + 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, s, session[s].tunnel, "Allocated radius %d\n", r); return r; } // Send a RADIUS request -void radiussend(u8 r, u8 state) +void radiussend(uint16_t r, uint8_t state) { struct sockaddr_in addr; - u8 b[4096]; // RADIUS packet + uint8_t b[4096]; // RADIUS packet char pass[129]; int pl; - u8 *p; + uint8_t *p; sessionidt s; -#ifdef STAT_CALLS - STAT(call_radiussend); -#endif - if (!numradiusservers) + + CSTAT(call_radiussend); + + s = radius[r].session; + if (!config->numradiusservers) { - log(0, 0, 0, 0, "No RADIUS servers\n"); + LOG(0, s, session[s].tunnel, "No RADIUS servers\n"); return; } - if (!radiussecret) + if (!*config->radiussecret) { - log(0, 0, 0, 0, "No RADIUS secret\n"); + LOG(0, s, session[s].tunnel, "No RADIUS secret\n"); return; } - s = radius[r].session; - if (state != RADIUSAUTH && !radius_accounting) + if (state != RADIUSAUTH && !config->radius_accounting) { // Radius accounting is turned off radiusclear(r, s); @@ -110,12 +143,22 @@ void radiussend(u8 r, u8 state) radius[r].try = 0; radius[r].state = state; radius[r].retry = backoff(radius[r].try++); - log(4, 0, s, session[s].tunnel, "Send RADIUS %d state %s try %d\n", r, radius_state(radius[r].state), radius[r].try); - if (radius[r].try > numradiusservers * 2) + LOG(4, s, session[s].tunnel, "Send RADIUS id %d sock %d state %s try %d\n", + r >> RADIUS_SHIFT, r & RADIUS_MASK, + radius_state(radius[r].state), radius[r].try); + + if (radius[r].try > config->numradiusservers * 2) { if (s) { - sessionshutdown(s, "RADIUS timeout"); + if (state == RADIUSAUTH) + sessionshutdown(s, "RADIUS timeout"); + else + { + LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n", + radius_states[state]); + radiusclear(r, s); + } STAT(radius_timeout); } else @@ -129,17 +172,17 @@ void radiussend(u8 r, u8 state) // contruct RADIUS access request switch (state) { - case RADIUSAUTH: - b[0] = 1; // access request - break; - case RADIUSSTART: - case RADIUSSTOP: - b[0] = 4; // accounting request - break; - default: - log(0, 0, 0, 0, "Unknown radius state %d\n", state); + case RADIUSAUTH: + b[0] = 1; // access request + break; + case RADIUSSTART: + case RADIUSSTOP: + b[0] = 4; // accounting request + break; + default: + LOG(0, 0, 0, "Unknown radius state %d\n", state); } - b[1] = r; // identifier + b[1] = r >> RADIUS_SHIFT; // identifier memcpy(b + 4, radius[r].auth, 16); p = b + 20; if (s) @@ -177,7 +220,7 @@ void radiussend(u8 r, u8 state) { MD5_CTX ctx; MD5Init(&ctx); - MD5Update(&ctx, radiussecret, strlen(radiussecret)); + MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret)); if (p) MD5Update(&ctx, pass + p - 16, 16); else @@ -202,7 +245,7 @@ void radiussend(u8 r, u8 state) { // accounting *p = 40; // accounting type p[1] = 6; - *(u32 *) (p + 2) = htonl((state == RADIUSSTART) ? 1 : 2); + *(uint32_t *) (p + 2) = htonl((state == RADIUSSTART) ? 1 : 2); p += p[1]; if (s) { @@ -214,30 +257,42 @@ void radiussend(u8 r, u8 state) { // stop *p = 42; // input octets p[1] = 6; - *(u32 *) (p + 2) = htonl(session[s].cin); + *(uint32_t *) (p + 2) = htonl(session[s].cin); p += p[1]; *p = 43; // output octets p[1] = 6; - *(u32 *) (p + 2) = htonl(session[s].cout); + *(uint32_t *) (p + 2) = htonl(session[s].cout); p += p[1]; *p = 46; // session time p[1] = 6; - *(u32 *) (p + 2) = htonl(time(NULL) - session[s].opened); + *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened); p += p[1]; *p = 47; // input packets p[1] = 6; - *(u32 *) (p + 2) = htonl(session[s].pin); + *(uint32_t *) (p + 2) = htonl(session[s].pin); p += p[1]; *p = 48; // output spackets p[1] = 6; - *(u32 *) (p + 2) = htonl(session[s].pout); + *(uint32_t *) (p + 2) = htonl(session[s].pout); p += p[1]; } else { // start *p = 41; // delay p[1] = 6; - *(u32 *) (p + 2) = htonl(time(NULL) - session[s].opened); + *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened); + p += p[1]; + } + + if (session[s].snoop_ip && session[s].snoop_port) + { + *p = 26; // vendor-specific + *(uint32_t *) (p + 2) = htonl(9); // Cisco + p[6] = 1; // Cisco-Avpair + p[7] = 2 + sprintf(p + 8, "intercept=%s:%d", + fmtaddr(session[s].snoop_ip, 0), session[s].snoop_port); + + p[1] = p[7] + 6; p += p[1]; } } @@ -246,14 +301,14 @@ void radiussend(u8 r, u8 state) { *p = 5; // NAS-Port p[1] = 6; - *(u32 *) (p + 2) = htonl(s); + *(uint32_t *) (p + 2) = htonl(s); p += p[1]; } if (s && session[s].ip) { *p = 8; // Framed-IP-Address p[1] = 6; - *(u32 *) (p + 2) = htonl(session[s].ip); + *(uint32_t *) (p + 2) = htonl(session[s].ip); p += p[1]; } if (*session[s].called) @@ -280,11 +335,11 @@ void radiussend(u8 r, u8 state) // NAS-IP-Address *p = 4; p[1] = 6; - *(u32 *)(p + 2) = bind_address; + *(uint32_t *)(p + 2) = config->bind_address; p += p[1]; // All AVpairs added - *(u16 *) (b + 2) = htons(p - b); + *(uint16_t *) (b + 2) = htons(p - b); if (state != RADIUSAUTH) { // Build auth for accounting packet @@ -295,52 +350,65 @@ void radiussend(u8 r, u8 state) MD5Update(&ctx, b, 4); MD5Update(&ctx, z, 16); MD5Update(&ctx, b + 20, (p - b) - 20); - MD5Update(&ctx, radiussecret, strlen(radiussecret)); + MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret)); MD5Final(hash, &ctx); memcpy(b + 4, hash, 16); memcpy(radius[r].auth, hash, 16); } memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - *(u32 *) & addr.sin_addr = htonl(radiusserver[(radius[r].try - 1) % numradiusservers]); - addr.sin_port = htons((state == RADIUSAUTH) ? RADPORT : RADAPORT); + *(uint32_t *) & addr.sin_addr = config->radiusserver[(radius[r].try - 1) % config->numradiusservers]; + { + // get radius port + uint16_t 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(radfd, b, p - b, 0, (void *) &addr, sizeof(addr)); + LOG_HEX(5, "RADIUS Send", b, (p - b)); + sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr)); } // process RADIUS response -void processrad(u8 * buf, int len) +void processrad(uint8_t *buf, int len, char socket_index) { - u8 b[MAXCONTROL]; + uint8_t b[MAXCONTROL]; MD5_CTX ctx; - u8 r; + uint16_t r; sessionidt s; tunnelidt t = 0; hasht hash; - u8 routes = 0; + uint8_t routes = 0; -#ifdef STAT_CALLS - STAT(call_processrad); -#endif - log_hex(5, "RADIUS Response", buf, len); - if (len < 20 || len < ntohs(*(u16 *) (buf + 2))) + 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(*(uint16_t *) (buf + 2))) { - log(1, 0, 0, 0, "Duff RADIUS response length %d\n", len); + LOG(1, 0, 0, "Duff RADIUS response length %d\n", len); return ; } - len = ntohs(*(u16 *) (buf + 2)); - r = buf[1]; + len = ntohs(*(uint16_t *) (buf + 2)); + 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, 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"); + LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n"); return; } if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART && radius[r].state != RADIUSSTOP) { - log(1, 0, s, session[s].tunnel, " Unexpected RADIUS response\n"); + LOG(1, s, session[s].tunnel, " Unexpected RADIUS response\n"); return; } t = session[s].tunnel; @@ -348,30 +416,30 @@ void processrad(u8 * buf, int len) MD5Update(&ctx, buf, 4); MD5Update(&ctx, radius[r].auth, 16); MD5Update(&ctx, buf + 20, len - 20); - MD5Update(&ctx, radiussecret, strlen(radiussecret)); + MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret)); MD5Final(hash, &ctx); 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, 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; + LOG(1, 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. } if (radius[r].state == RADIUSAUTH) { - log(4, 0, s, session[s].tunnel, " Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject"); + LOG(4, s, session[s].tunnel, " Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject"); // process auth response if (radius[r].chap) { // CHAP - u8 *p = makeppp(b, 0, 0, t, s, PPPCHAP); + uint8_t *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 }; @@ -379,17 +447,18 @@ void processrad(u8 * buf, int len) *buf = packet.auth_allowed ? 2 : 3; } - log(3, 0, s, session[s].tunnel, " CHAP User %s authentication %s.\n", session[s].user, + LOG(3, s, session[s].tunnel, " CHAP User %s authentication %s.\n", session[s].user, (*buf == 2) ? "allowed" : "denied"); *p = (*buf == 2) ? 3 : 4; // ack/nak p[1] = radius[r].id; - *(u16 *) (p + 2) = ntohs(4); // no message + *(uint16_t *) (p + 2) = ntohs(4); // no message tunnelsend(b, (p - b) + 4, t); // send it } else { // PAP - u8 *p = makeppp(b, 0, 0, t, s, PPPPAP); + uint8_t *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 }; @@ -397,12 +466,12 @@ void processrad(u8 * buf, int len) *buf = packet.auth_allowed ? 2 : 3; } - log(3, 0, s, session[s].tunnel, " PAP User %s authentication %s.\n", session[s].user, + LOG(3, s, session[s].tunnel, " PAP User %s authentication %s.\n", session[s].user, (*buf == 2) ? "allowed" : "denied"); // ack/nak *p = *buf; p[1] = radius[r].id; - *(u16 *) (p + 2) = ntohs(5); + *(uint16_t *) (p + 2) = ntohs(5); p[4] = 0; // no message tunnelsend(b, (p - b) + 5, t); // send it } @@ -411,36 +480,46 @@ void processrad(u8 * buf, int len) { // Login successful // Extract IP, routes, etc - u8 *p = buf + 20; - u8 *e = buf + len; - for (p = buf + 20; p < e && p[1]; p += p[1]) + uint8_t *p = buf + 20; + uint8_t *e = buf + len; + for (; p + 2 <= e && p[1] && p + p[1] <= e; p += p[1]) { if (*p == 8) { - // 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)); + // Framed-IP-Address + if (p[1] < 6) continue; + session[s].ip = ntohl(*(uint32_t *) (p + 2)); + session[s].ip_pool_index = -1; + LOG(3, s, session[s].tunnel, " Radius reply contains IP address %s\n", + fmtaddr(htonl(session[s].ip), 0)); + + if (session[s].ip == 0xFFFFFFFE) + session[s].ip = 0; // assign from pool } 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)))); - session[s].dns1 = ntohl(*(u32 *) (p + 2)); + if (p[1] < 6) continue; + session[s].dns1 = ntohl(*(uint32_t *) (p + 2)); + LOG(3, s, session[s].tunnel, " Radius reply contains primary DNS address %s\n", + fmtaddr(htonl(session[s].dns1), 0)); } 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)))); - session[s].dns2 = ntohl(*(u32 *) (p + 2)); + if (p[1] < 6) continue; + session[s].dns2 = ntohl(*(uint32_t *) (p + 2)); + LOG(3, s, session[s].tunnel, " Radius reply contains secondary DNS address %s\n", + fmtaddr(htonl(session[s].dns2), 0)); } else if (*p == 22) { - // framed-route - ipt ip = 0, mask = 0; - u8 u = 0; - u8 bits = 0; - u8 *n = p + 2; - u8 *e = p + p[1]; + // Framed-Route + in_addr_t ip = 0, mask = 0; + uint8_t u = 0; + uint8_t bits = 0; + uint8_t *n = p + 2; + uint8_t *e = p + p[1]; while (n < e && (isdigit(*n) || *n == '.')) { if (*n == '.') @@ -466,107 +545,134 @@ void processrad(u8 * buf, int len) mask = 0xFFFF0000; else mask = 0xFFFFFF00; + if (routes == MAXROUTE) { - log(1, 0, s, session[s].tunnel, " Too many routes\n"); + LOG(1, s, session[s].tunnel, " Too many routes\n"); } - else + else if (ip) { - log(3, 0, s, session[s].tunnel, " Radius reply contains route for %d/%d\n", - inet_toa(ip), - inet_toa(mask)); + LOG(3, s, session[s].tunnel, " Radius reply contains route for %s/%s\n", + fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1)); + session[s].route[routes].ip = ip; session[s].route[routes].mask = mask; routes++; } } - else if (*p == 26) + else if (*p == 11) + { + // Filter-Id + char *filter = p + 2; + int l = p[1] - 2; + char *suffix; + uint8_t *f = 0; + int i; + + LOG(3, s, session[s].tunnel, " Radius reply contains Filter-Id \"%.*s\"\n", l, filter); + if ((suffix = memchr(filter, '.', l))) + { + int b = suffix - filter; + if (l - b == 3 && !memcmp("in", suffix+1, 2)) + f = &session[s].filter_in; + else if (l - b == 4 && !memcmp("out", suffix+1, 3)) + f = &session[s].filter_out; + + l = b; + } + + if (!f) + { + LOG(3, s, session[s].tunnel, " Invalid filter\n"); + continue; + } + + for (*f = 0, i = 0; !*f && i < MAXFILTER; i++) + if (strlen(ip_filters[i].name) == l && + !strncmp(ip_filters[i].name, filter, l)) + *f = i + 1; + + if (*f) + ip_filters[*f - 1].used++; + else + LOG(3, s, session[s].tunnel, " Unknown filter\n"); + + } + else if (*p == 26 && p[1] >= 7) { // Vendor-Specific Attribute int vendor = ntohl(*(int *)(p + 2)); char attrib = *(p + 6); char attrib_length = *(p + 7) - 2; - log(3, 0, s, session[s].tunnel, " Radius reply contains Vendor-Specific. Vendor=%d Attrib=%d Length=%d\n", vendor, attrib, attrib_length); - if (attrib_length == 0) continue; - if (attrib != 1) - log(3, 0, s, session[s].tunnel, " Unknown vendor-specific\n"); - else + char *avpair, *value, *key, *newp; + + LOG(3, s, session[s].tunnel, " Radius reply contains Vendor-Specific. Vendor=%d Attrib=%d Length=%d\n", vendor, attrib, attrib_length); + if (vendor != 9 || attrib != 1) { - char *avpair, *value, *key, *newp; - avpair = key = calloc(attrib_length + 1, 1); - memcpy(avpair, p + 8, attrib_length); - log(3, 0, s, session[s].tunnel, " Cisco-Avpair value: %s\n", avpair); - do { - value = strchr(key, '='); - if (!value) break; - *value++ = 0; - - // Trim quotes off reply string - if (*value == '\'' || *value == '\"') - { - char *x; - value++; - x = value + strlen(value) - 1; - if (*x == '\'' || *x == '\"') - *x = 0; - } - - // Run hooks - newp = strchr(value, ','); - if (newp) *newp++ = 0; - { - struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], key, value }; - run_plugins(PLUGIN_RADIUS_RESPONSE, &p); - } - key = newp; - } while (newp); - free(avpair); + LOG(3, s, session[s].tunnel, " Unknown vendor-specific\n"); + continue; } + + if (attrib_length < 0) continue; + + avpair = key = calloc(attrib_length + 1, 1); + memcpy(avpair, p + 8, attrib_length); + LOG(3, s, session[s].tunnel, " Cisco-Avpair value: %s\n", avpair); + do { + value = strchr(key, '='); + if (!value) break; + *value++ = 0; + + // Trim quotes off reply string + if (*value == '\'' || *value == '\"') + { + char *x; + value++; + x = value + strlen(value) - 1; + if (*x == '\'' || *x == '\"') + *x = 0; + } + + // Run hooks + newp = strchr(value, ','); + if (newp) *newp++ = 0; + { + struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], key, value }; + run_plugins(PLUGIN_RADIUS_RESPONSE, &p); + } + key = newp; + } while (newp); + free(avpair); } } } else if (*buf == 3) { - log(2, 0, s, session[s].tunnel, " Authentication denied for %s\n", session[s].user); + LOG(2, s, session[s].tunnel, " Authentication rejected for %s\n", session[s].user); + sessionkill(s, "Authentication rejected"); break; } - // Check for Assign-IP-Address - if (!session[s].ip || session[s].ip == 0xFFFFFFFE) - { - session[s].ip = assign_ip_address(); - 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(3, 0, s, t, " No IP allocated by radius. None available in pool\n"); - } - if (!session[s].dns1 && default_dns1) + if (!session[s].dns1 && config->default_dns1) { - session[s].dns1 = htonl(default_dns1); - log(3, 0, s, t, " Sending dns1 = %s\n", inet_toa(default_dns1)); + session[s].dns1 = htonl(config->default_dns1); + LOG(3, s, t, " Sending dns1 = %s\n", fmtaddr(config->default_dns1, 0)); } - if (!session[s].dns2 && default_dns2) + if (!session[s].dns2 && config->default_dns2) { - session[s].dns2 = htonl(default_dns2); - log(3, 0, s, t, " Sending dns2 = %s\n", inet_toa(default_dns2)); + session[s].dns2 = htonl(config->default_dns2); + LOG(3, s, t, " Sending dns2 = %s\n", fmtaddr(config->default_dns2, 0)); } - 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].unique_id = 0; + sessionsetup(t, s); } else { - log(3, 0, s, t, " RADIUS response in state %d\n", radius[r].state); + // An ack for a stop or start record. + LOG(3, s, t, " RADIUS accounting ack recv in state %s\n", radius_states[radius[r].state]); + break; } } while (0); @@ -575,40 +681,40 @@ void processrad(u8 * buf, int len) } // Send a retry for RADIUS/CHAP message -void radiusretry(u8 r) +void radiusretry(uint16_t 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 = 0; + + radius[r].retry = backoff(radius[r].try + 1); switch (radius[r].state) { - case RADIUSCHAP: // sending CHAP down PPP - sendchap(t, s); - break; - case RADIUSIPCP: - sendipcp(t, s); // send IPCP - break; - case RADIUSAUTH: // sending auth to RADIUS server - radiussend(r, RADIUSAUTH); - break; - case RADIUSSTART: // sending start accounting to RADIUS server - radiussend(r, RADIUSSTART); - break; - case RADIUSSTOP: // sending stop accounting to RADIUS server - radiussend(r, RADIUSSTOP); - break; - default: - case RADIUSNULL: // Not in use - case RADIUSWAIT: // waiting timeout before available, in case delayed reply from RADIUS server - // free up RADIUS task - radiusclear(r, s); - log(3, 0, s, session[s].tunnel, "Freeing up radius session %d\n", r); - break; + case RADIUSCHAP: // sending CHAP down PPP + sendchap(t, s); + break; + case RADIUSIPCP: + sendipcp(t, s); // send IPCP + break; + case RADIUSAUTH: // sending auth to RADIUS server + radiussend(r, RADIUSAUTH); + break; + case RADIUSSTART: // sending start accounting to RADIUS server + radiussend(r, RADIUSSTART); + break; + case RADIUSSTOP: // sending stop accounting to RADIUS server + radiussend(r, RADIUSSTOP); + break; + default: + case RADIUSNULL: // Not in use + case RADIUSWAIT: // waiting timeout before available, in case delayed reply from RADIUS server + // free up RADIUS task + radiusclear(r, s); + LOG(3, s, session[s].tunnel, "Freeing up radius session %d\n", r); + break; } } -