use LOG for logging macro

[l2tpns.git] / radius.c

diff --git a/radius.c b/radius.c
index 3f1d541..d2e2d3b 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,5 +1,6 @@
 // L2TPNS Radius Stuff
 // 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.11 2004-11-05 04:55:27 bodea Exp $";

 
 #include <time.h>
 #include <stdio.h>
 
 #include <time.h>
 #include <stdio.h>


@@ -7,6 +8,7 @@
 #include <sys/socket.h>
 #include <malloc.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <malloc.h>
 #include <string.h>

+#include <fcntl.h>

 #include <arpa/inet.h>
 #include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <netinet/in.h>


@@ -16,20 +18,12 @@
 #include "plugin.h"
 #include "util.h"
 
 #include "plugin.h"
 #include "util.h"
 

-extern char *radiussecret;

 extern radiust *radius;
 extern sessiont *session;
 extern tunnelt *tunnel;
 extern radiust *radius;
 extern sessiont *session;
 extern tunnelt *tunnel;

-extern ipt radiusserver[MAXRADSERVER]; // radius servers

 extern u32 sessionid;
 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;
+extern struct configt *config;
+extern int *radfds;

 
 const char *radius_state(int state)
 {
 
 const char *radius_state(int state)
 {


@@ -46,37 +40,76 @@ const char *radius_state(int state)
 // Set up socket for radius requests
 void initrad(void)
 {
 // Set up socket for radius requests
 void initrad(void)
 {

-       radfd = socket(AF_INET, SOCK_DGRAM, UDP);
+       int i;
+       LOG(3, 0, 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;
+               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);
+       }

 }
 
 }
 

-void radiusclear(u8 r, sessionidt s)
+void radiusclear(u16 r, sessionidt s)

 {
 {

-       radius[r].state = RADIUSNULL;

        if (s) session[s].radius = 0;
        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 u16 get_free_radius()
+{
+       int count;
+       static u32 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, 0, "Can't find a free radius session! This is very bad!\n");
+       return 0;

 }
 
 }
 

-u8 radiusnew(sessionidt s)
+u16 radiusnew(sessionidt s)

 {
 {

-       u8 r;
-       if (!radiusfree)
+       u16 r = session[s].radius;
+
+       /* re-use */
+       if (r)

        {
        {

-               log(1, 0, s, session[s].tunnel, "No free RADIUS sessions\n");
+               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;
        };
                STAT(radius_overflow);
                return 0;
        };

-       r = radiusfree;
-       session[s].radius = r;
-       radiusfree = radius[r].next;
+

        memset(&radius[r], 0, sizeof(radius[r]));
        memset(&radius[r], 0, sizeof(radius[r]));

+       session[s].radius = r;

        radius[r].session = s;
        radius[r].session = s;

+       radius[r].state = RADIUSWAIT;
+       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;
 }
 
 // Send a RADIUS request
        return r;
 }
 
 // Send a RADIUS request

-void radiussend(u8 r, u8 state)
+void radiussend(u16 r, u8 state)

 {
        struct sockaddr_in addr;
        u8 b[4096];            // RADIUS packet
 {
        struct sockaddr_in addr;
        u8 b[4096];            // RADIUS packet


@@ -84,22 +117,22 @@ void radiussend(u8 r, u8 state)
        int pl;
        u8 *p;
        sessionidt s;
        int pl;
        u8 *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, 0, s, session[s].tunnel, "No RADIUS servers\n");

                return;
        }
                return;
        }

-       if (!radiussecret)
+       if (!*config->radiussecret)

        {
        {

-               log(0, 0, 0, 0, "No RADIUS secret\n");
+               LOG(0, 0, s, session[s].tunnel, "No RADIUS secret\n");

                return;
        }
                return;
        }

-       s = radius[r].session;

 
 

-       if (state != RADIUSAUTH && !radius_accounting)
+       if (state != RADIUSAUTH && !config->radius_accounting)

        {
                // Radius accounting is turned off
                radiusclear(r, s);
        {
                // Radius accounting is turned off
                radiusclear(r, s);


@@ -110,12 +143,21 @@ void radiussend(u8 r, u8 state)
                radius[r].try = 0;
        radius[r].state = state;
        radius[r].retry = backoff(radius[r].try++);
                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, 0, 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)
                {
        {
                if (s)
                {

-                       sessionshutdown(s, "RADIUS timeout");
+                       if (state == RADIUSAUTH)
+                               sessionshutdown(s, "RADIUS timeout");
+                       else
+                       {
+                               LOG(1, 0, 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
                        STAT(radius_timeout);
                }
                else


@@ -129,17 +171,17 @@ void radiussend(u8 r, u8 state)
        // contruct RADIUS access request
        switch (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, 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)
        memcpy(b + 4, radius[r].auth, 16);
        p = b + 20;
        if (s)


@@ -177,7 +219,7 @@ void radiussend(u8 r, u8 state)
                                {
                                        MD5_CTX ctx;
                                        MD5Init(&ctx);
                                {
                                        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
                                        if (p)
                                                MD5Update(&ctx, pass + p - 16, 16);
                                        else


@@ -280,7 +322,7 @@ void radiussend(u8 r, u8 state)
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;

-       *(u32 *)(p + 2) = bind_address;
+       *(u32 *)(p + 2) = config->bind_address;

        p += p[1];
 
        // All AVpairs added
        p += p[1];
 
        // All AVpairs added


@@ -295,52 +337,65 @@ void radiussend(u8 r, u8 state)
            MD5Update(&ctx, b, 4);
            MD5Update(&ctx, z, 16);
            MD5Update(&ctx, b + 20, (p - b) - 20);
            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;
            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);
+       *(u32 *) & addr.sin_addr = config->radiusserver[(radius[r].try - 1) % config->numradiusservers];
+       {
+           // 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(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
 }
 
 // process RADIUS response

-void processrad(u8 * buf, int len)
+void processrad(u8 *buf, int len, char socket_index)

 {
        u8 b[MAXCONTROL];
        MD5_CTX ctx;
 {
        u8 b[MAXCONTROL];
        MD5_CTX ctx;

-       u8 r;
+       u16 r;

        sessionidt s;
        tunnelidt t = 0;
        hasht hash;
        u8 routes = 0;
 
        sessionidt s;
        tunnelidt t = 0;
        hasht hash;
        u8 routes = 0;
 

-#ifdef STAT_CALLS
-       STAT(call_processrad);
-#endif
-       log_hex(5, "RADIUS Response", buf, len);
+       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(*(u16 *) (buf + 2)))
        {
        if (len < 20 || len < ntohs(*(u16 *) (buf + 2)))
        {

-               log(1, 0, 0, 0, "Duff RADIUS response length %d\n", len);
+               LOG(1, 0, 0, 0, "Duff RADIUS response length %d\n", len);

                return ;
        }
        len = ntohs(*(u16 *) (buf + 2));
                return ;
        }
        len = ntohs(*(u16 *) (buf + 2));

-       r = buf[1];
+       r = socket_index | (r_id << RADIUS_SHIFT);

        s = radius[r].session;
        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, 0, 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)
        {
        if (!s && radius[r].state != RADIUSSTOP)
        {

-               log(1, 0, s, session[s].tunnel, "   Unexpected RADIUS response\n");
+               LOG(1, 0, s, session[s].tunnel, "   Unexpected RADIUS response\n");

                return;
        }
        if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART && radius[r].state != RADIUSSTOP)
        {
                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, 0, s, session[s].tunnel, "   Unexpected RADIUS response\n");

                return;
        }
        t = session[s].tunnel;
                return;
        }
        t = session[s].tunnel;


@@ -348,38 +403,39 @@ void processrad(u8 * buf, int len)
        MD5Update(&ctx, buf, 4);
        MD5Update(&ctx, radius[r].auth, 16);
        MD5Update(&ctx, buf + 20, len - 20);
        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))
                {
        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, 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))
                {
                }
                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, 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.

                }
                if (radius[r].state == RADIUSAUTH)
                {
                }
                if (radius[r].state == RADIUSAUTH)
                {

-                       log(4, 0, s, session[s].tunnel, "   Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject");
+                       LOG(4, 0, s, session[s].tunnel, "   Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject");

                        // process auth response
                        if (radius[r].chap)
                        {
                                // CHAP
                        // process auth response
                        if (radius[r].chap)
                        {
                                // CHAP

-                               u8 *p = makeppp(b, 0, 0, t, s, PPPCHAP);
-
+                               u8 *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 };
                                        run_plugins(PLUGIN_POST_AUTH, &packet);
                                        *buf = packet.auth_allowed ? 2 : 3;
                                }
 
                                {
                                        struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPCHAP };
                                        run_plugins(PLUGIN_POST_AUTH, &packet);
                                        *buf = packet.auth_allowed ? 2 : 3;
                                }
 

-                               log(3, 0, s, session[s].tunnel, "   CHAP User %s authentication %s.\n", session[s].user,
+                               LOG(3, 0, 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;
                                                (*buf == 2) ? "allowed" : "denied");
                                *p = (*buf == 2) ? 3 : 4;     // ack/nak
                                p[1] = radius[r].id;


@@ -389,7 +445,9 @@ void processrad(u8 * buf, int len)
                        else
                        {
                                // PAP
                        else
                        {
                                // PAP

-                               u8 *p = makeppp(b, 0, 0, t, s, PPPPAP);
+                               u8 *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 };
 
                                {
                                        struct param_post_auth packet = { &tunnel[t], &session[s], session[s].user, (*buf == 2), PPPPAP };


@@ -397,7 +455,7 @@ void processrad(u8 * buf, int len)
                                        *buf = packet.auth_allowed ? 2 : 3;
                                }
 
                                        *buf = packet.auth_allowed ? 2 : 3;
                                }
 

-                               log(3, 0, s, session[s].tunnel, "   PAP User %s authentication %s.\n", session[s].user,
+                               LOG(3, 0, s, session[s].tunnel, "   PAP User %s authentication %s.\n", session[s].user,

                                                (*buf == 2) ? "allowed" : "denied");
                                // ack/nak
                                *p = *buf;
                                                (*buf == 2) ? "allowed" : "denied");
                                // ack/nak
                                *p = *buf;


@@ -418,19 +476,20 @@ void processrad(u8 * buf, int len)
                                        if (*p == 8)
                                        {
                                                // Statically assigned address
                                        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)));
+                                               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));
                                                session[s].ip = ntohl(*(u32 *) (p + 2));

+                                               session[s].ip_pool_index = -1;

                                        }
                                        else if (*p == 135)
                                        {
                                                // DNS address
                                        }
                                        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))));
+                                               LOG(3, 0, s, session[s].tunnel, "   Radius reply contains primary DNS address %s\n", inet_toa(*(u32 *) (p + 2)));

                                                session[s].dns1 = ntohl(*(u32 *) (p + 2));
                                        }
                                        else if (*p == 136)
                                        {
                                                // DNS address
                                                session[s].dns1 = ntohl(*(u32 *) (p + 2));
                                        }
                                        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))));
+                                               LOG(3, 0, s, session[s].tunnel, "   Radius reply contains secondary DNS address %s\n", inet_toa(*(u32 *) (p + 2)));

                                                session[s].dns2 = ntohl(*(u32 *) (p + 2));
                                        }
                                        else if (*p == 22)
                                                session[s].dns2 = ntohl(*(u32 *) (p + 2));
                                        }
                                        else if (*p == 22)


@@ -468,13 +527,16 @@ void processrad(u8 * buf, int len)
                                                        mask = 0xFFFFFF00;
                                                if (routes == MAXROUTE)
                                                {
                                                        mask = 0xFFFFFF00;
                                                if (routes == MAXROUTE)
                                                {

-                                                       log(1, 0, s, session[s].tunnel, "   Too many routes\n");
+                                                       LOG(1, 0, 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));
+                                                       char *ips, *masks;
+                                                       ips = strdup(inet_toa(htonl(ip)));
+                                                       masks = strdup(inet_toa(htonl(mask)));
+                                                       LOG(3, 0, s, session[s].tunnel, "   Radius reply contains route for %s/%s\n", ips, masks);
+                                                       free(ips);
+                                                       free(masks);

                                                        session[s].route[routes].ip = ip;
                                                        session[s].route[routes].mask = mask;
                                                        routes++;
                                                        session[s].route[routes].ip = ip;
                                                        session[s].route[routes].mask = mask;
                                                        routes++;


@@ -486,16 +548,16 @@ void processrad(u8 * buf, int len)
                                                int vendor = ntohl(*(int *)(p + 2));
                                                char attrib = *(p + 6);
                                                char attrib_length = *(p + 7) - 2;
                                                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);
+                                               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)
                                                if (attrib_length == 0) continue;
                                                if (attrib != 1)

-                                                       log(3, 0, s, session[s].tunnel, "      Unknown vendor-specific\n");
+                                                       LOG(3, 0, s, session[s].tunnel, "      Unknown vendor-specific\n");

                                                else
                                                {
                                                        char *avpair, *value, *key, *newp;
                                                        avpair = key = calloc(attrib_length + 1, 1);
                                                        memcpy(avpair, p + 8, attrib_length);
                                                else
                                                {
                                                        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);
+                                                       LOG(3, 0, s, session[s].tunnel, "      Cisco-Avpair value: %s\n", avpair);

                                                        do {
                                                                value = strchr(key, '=');
                                                                if (!value) break;
                                                        do {
                                                                value = strchr(key, '=');
                                                                if (!value) break;


@@ -527,46 +589,31 @@ void processrad(u8 * buf, int len)
                        }
                        else if (*buf == 3)
                        {
                        }
                        else if (*buf == 3)
                        {

-                               log(2, 0, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);
+                               LOG(2, 0, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);
+//FIXME: We should tear down the session here!

                                break;
                        }
 
                                break;
                        }
 

-                       // Check for Assign-IP-Address
-                       if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
+                       if (!session[s].dns1 && config->default_dns1)

                        {
                        {

-                               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");
+                               session[s].dns1 = htonl(config->default_dns1);
+                               LOG(3, 0, s, t, "   Sending dns1 = %s\n", inet_toa(config->default_dns1));

                        }
                        }

-                       if (!session[s].dns1 && default_dns1)
+                       if (!session[s].dns2 && config->default_dns2)

                        {
                        {

-                               session[s].dns1 = htonl(default_dns1);
-                               log(3, 0, s, t, "   Sending dns1 = %s\n", inet_toa(default_dns1));
-                       }
-                       if (!session[s].dns2 && 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, 0, s, t, "   Sending dns2 = %s\n", inet_toa(config->default_dns2));

                        }
 
                        }
 

-                       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
                {
                }
                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, 0, s, t, "   RADIUS accounting ack recv in state %s\n", radius_states[radius[r].state]);
+                       break;

                }
        } while (0);
 
                }
        } while (0);
 


@@ -575,40 +622,55 @@ void processrad(u8 * buf, int len)
 }
 
 // Send a retry for RADIUS/CHAP message
 }
 
 // Send a retry for RADIUS/CHAP message

-void radiusretry(u8 r)
+void radiusretry(u16 r)

 {
        sessionidt s = radius[r].session;
        tunnelidt t = 0;
 {
        sessionidt s = radius[r].session;
        tunnelidt t = 0;

-#ifdef STAT_CALLS
-       STAT(call_radiusretry);
-#endif
+
+       CSTAT(call_radiusretry);
+

        if (s)
                t = session[s].tunnel;
        if (s)
                t = session[s].tunnel;

-       radius[r].retry = 0;
+       radius[r].retry = backoff(radius[r].try + 1);

        switch (radius[r].state)
        {
        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, 0, s, session[s].tunnel, "Freeing up radius session %d\n", r);
+                       break;

        }
 }
 
        }
 }
 

+void radius_clean()
+{
+       int i;
+
+       LOG(1, 0, 0, 0, "Cleaning radius session array\n");
+
+       for (i = 1; i < MAXRADIUS; i++)
+       {
+               if (radius[i].retry == 0
+                               || !session[radius[i].session].opened
+                               || session[radius[i].session].die
+                               || session[radius[i].session].tunnel == 0)
+                       radiusclear(i, radius[i].session);
+       }
+}