use ctime rather than duration

[l2tpns.git] / radius.c

diff --git a/radius.c b/radius.c
index 2a2db48..ff52cdc 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,5 +1,6 @@
 // L2TPNS Radius Stuff
 // 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.22 2005/01/05 14:35:01 bodea Exp $";

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


@@ -20,107 +21,101 @@
 extern radiust *radius;
 extern sessiont *session;
 extern tunnelt *tunnel;
 extern radiust *radius;
 extern sessiont *session;
 extern tunnelt *tunnel;

-extern u32 sessionid;
-extern struct configt *config;
+extern configt *config;

 extern int *radfds;
 extern int *radfds;

-
-const char *radius_state(int state)
-{
-       static char *tmp = NULL;
-       int i;
-       for (i = 0; radius_states[i]; i++)
-               if (i == state) return radius_states[i];
-
-       if (tmp == NULL) tmp = (char *)calloc(64, 1);
-       sprintf(tmp, "%d", state);
-       return tmp;
-}
+extern ip_filtert *ip_filters;

 
 // Set up socket for radius requests
 void initrad(void)
 {
        int i;
 
 // Set up socket for radius requests
 void initrad(void)
 {
        int i;

-       log(3, 0, 0, 0, "Creating %d sockets for RADIUS queries\n", config->num_radfds);
+       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 = 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, UDP);
+               radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

                flags = fcntl(radfds[i], F_GETFL, 0);
                fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
        }
 }
 
                flags = fcntl(radfds[i], F_GETFL, 0);
                fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
        }
 }
 

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

 {
        if (s) session[s].radius = 0;
        memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL;
 }
 
 {
        if (s) session[s].radius = 0;
        memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL;
 }
 

-int next_radius_id = 1;
-
-static u16 new_radius()
+static uint16_t get_free_radius()

 {
 {

-       u16 i;
-       int loops = 0;
-       for (i = next_radius_id; ; i = (i + 1) % MAXRADIUS)
+       int count;
+       static uint32_t 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, "Can't find a free radius session! This is very bad!\n");
+       return 0;

 }
 
 }
 

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

 {
 {

-       u16 r;
-       if (!(r = new_radius()))
+       uint16_t r = session[s].radius;
+
+       /* re-use */
+       if (r)
+       {
+               LOG(3, 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");
+               LOG(1, s, session[s].tunnel, "No free RADIUS sessions\n");

                STAT(radius_overflow);
                return 0;
        };
                STAT(radius_overflow);
                return 0;
        };

+

        memset(&radius[r], 0, sizeof(radius[r]));
        session[s].radius = r;
        radius[r].session = s;
        radius[r].state = RADIUSWAIT;
        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);
+       LOG(3, s, session[s].tunnel, "Allocated radius %d\n", r);

        return r;
 }
 
 // Send a RADIUS request
        return r;
 }
 
 // Send a RADIUS request

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

 {
        struct sockaddr_in addr;
 {
        struct sockaddr_in addr;

-       u8 b[4096];            // RADIUS packet
+       uint8_t b[4096];            // RADIUS packet

        char pass[129];
        int pl;
        char pass[129];
        int pl;

-       u8 *p;
+       uint8_t *p;

        sessionidt s;
        sessionidt s;

-#ifdef STAT_CALLS
-       STAT(call_radiussend);
-#endif
+
+       CSTAT(radiussend);
+

        s = radius[r].session;
        if (!config->numradiusservers)
        {
        s = radius[r].session;
        if (!config->numradiusservers)
        {

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

                return;
        }
        if (!*config->radiussecret)
        {
                return;
        }
        if (!*config->radiussecret)
        {

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

                return;
        }
 
                return;
        }
 


@@ -133,11 +128,13 @@ void radiussend(u16 r, u8 state)
 
        if (radius[r].state != state)
                radius[r].try = 0;
 
        if (radius[r].state != state)
                radius[r].try = 0;

+

        radius[r].state = state;
        radius[r].retry = backoff(radius[r].try++);
        radius[r].state = state;
        radius[r].retry = backoff(radius[r].try++);

-       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);
+       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)
        if (radius[r].try > config->numradiusservers * 2)
        {
                if (s)


@@ -146,8 +143,8 @@ void radiussend(u16 r, u8 state)
                                sessionshutdown(s, "RADIUS timeout");
                        else
                        {
                                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]);
+                               LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
+                                       radius_state(state));

                                radiusclear(r, s);
                        }
                        STAT(radius_timeout);
                                radiusclear(r, s);
                        }
                        STAT(radius_timeout);


@@ -158,7 +155,7 @@ void radiussend(u16 r, u8 state)
                        radius[r].state = RADIUSWAIT;
                        radius[r].retry = 100;
                }
                        radius[r].state = RADIUSWAIT;
                        radius[r].retry = 100;
                }

-               return ;
+               return;

        }
        // contruct RADIUS access request
        switch (state)
        }
        // contruct RADIUS access request
        switch (state)


@@ -171,7 +168,7 @@ void radiussend(u16 r, u8 state)
                        b[0] = 4;               // accounting request
                        break;
                default:
                        b[0] = 4;               // accounting request
                        break;
                default:

-                       log(0, 0, 0, 0, "Unknown radius state %d\n", state);
+                       LOG(0, 0, 0, "Unknown radius state %d\n", state);

        }
        b[1] = r >> RADIUS_SHIFT;       // identifier
        memcpy(b + 4, radius[r].auth, 16);
        }
        b[1] = r >> RADIUS_SHIFT;       // identifier
        memcpy(b + 4, radius[r].auth, 16);


@@ -236,7 +233,7 @@ void radiussend(u16 r, u8 state)
        {                          // accounting
                *p = 40;                // accounting type
                p[1] = 6;
        {                          // 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)
                {
                p += p[1];
                if (s)
                {


@@ -248,30 +245,30 @@ void radiussend(u16 r, u8 state)
                        {                // stop
                                *p = 42;      // input octets
                                p[1] = 6;
                        {                // 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;
                                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;
                                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;
                                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;
                                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;
                                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];
                        }
                }
                                p += p[1];
                        }
                }


@@ -280,14 +277,14 @@ void radiussend(u16 r, u8 state)
        {
                *p = 5; // NAS-Port
                p[1] = 6;
        {
                *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;
                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)
                p += p[1];
        }
        if (*session[s].called)


@@ -314,11 +311,11 @@ void radiussend(u16 r, u8 state)
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;

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

        p += p[1];
 
        // All AVpairs added
        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
        if (state != RADIUSAUTH)
        {
            // Build auth for accounting packet


@@ -336,51 +333,57 @@ void radiussend(u16 r, u8 state)
        }
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        }
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;

-       *(u32 *) & addr.sin_addr = config->radiusserver[(radius[r].try - 1) % config->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];
+               // assume RADIUS accounting port is the authentication port +1
+               addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
+       }

 
 

-       log_hex(5, "RADIUS Send", b, (p - b));
+       LOG_HEX(5, "RADIUS Send", b, (p - b));

        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
 // process RADIUS response
        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
 // process RADIUS response

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

 {
 {

-       u8 b[MAXCONTROL];
+       uint8_t b[MAXCONTROL];

        MD5_CTX ctx;
        MD5_CTX ctx;

-       u16 r;
+       uint16_t r;

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

-       u8 routes = 0;
-
-       int r_code, r_id ; // Radius code.
+       uint8_t routes = 0;
+       int r_code;
+       int r_id;

 
 

-       r_code = buf[0]; // First byte in radius packet.
-       r_id = buf[1]; // radius reply indentifier.
+       CSTAT(processrad);

 
 

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

-       len = ntohs(*(u16 *) (buf + 2));
+
+       r_code = buf[0]; // response type
+       r_id = buf[1]; // radius reply indentifier.
+
+       len = ntohs(*(uint16_t *) (buf + 2));

        r = socket_index | (r_id << RADIUS_SHIFT);
        s = radius[r].session;
        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 (code %d, id %d)\n",
-                       radius_states[radius[r].state], r, s, r_code, r_id);
+       LOG(3, s, session[s].tunnel, "Received %s, radius %d response for session %u (%s, id %d)\n",
+                       radius_state(radius[r].state), r, s, radius_code(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, 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, s, session[s].tunnel, "   Unexpected RADIUS response\n");

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


@@ -393,104 +396,105 @@ void processrad(u8 *buf, int len, char socket_index)
        do {
                if (memcmp(hash, buf + 4, 16))
                {
        do {
                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;
-
+                       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.
                }
                        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);

 
 

+               if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) ||
+                       ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP) && r_code != AccountingResponse))
+               {
+                       LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response %s\n", radius_code(r_code));

                        return; // We got something we didn't expect. Let the timeouts take
                                // care off finishing the radius session if that's really correct.
                        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)
                {
                if (radius[r].state == RADIUSAUTH)
                {

-                       log(4, 0, s, session[s].tunnel, "   Original response is \"%s\"\n", (*buf == 2) ? "accept" : "reject");
+                       // run post-auth plugin
+                       struct param_post_auth packet = {
+                               &tunnel[t],
+                               &session[s],
+                               session[s].user,
+                               (r_code == AccessAccept),
+                               radius[r].chap ? PPPCHAP : PPPPAP
+                       };
+
+                       run_plugins(PLUGIN_POST_AUTH, &packet);
+                       r_code = packet.auth_allowed ? AccessAccept : AccessReject;
+

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

-                               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;
-                               }
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+                               if (!p) return; // Abort!

 
 

-                               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 = (r_code == AccessAccept) ? 3 : 4;     // ack/nak

                                p[1] = radius[r].id;
                                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
                                tunnelsend(b, (p - b) + 4, t); // send it

+
+                               LOG(3, s, session[s].tunnel, "   CHAP User %s authentication %s.\n", session[s].user,
+                                               (r_code == AccessAccept) ? "allowed" : "denied");

                        }
                        else
                        {
                                // PAP
                        }
                        else
                        {
                                // PAP

-                               u8 *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
-                               if (!p)
-                                       return;         // Abort!
+                               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 };
-                                       run_plugins(PLUGIN_POST_AUTH, &packet);
-                                       *buf = packet.auth_allowed ? 2 : 3;
-                               }
-
-                               log(3, 0, s, session[s].tunnel, "   PAP User %s authentication %s.\n", session[s].user,
-                                               (*buf == 2) ? "allowed" : "denied");

                                // ack/nak
                                // ack/nak

-                               *p = *buf;
+                               *p = r_code;

                                p[1] = radius[r].id;
                                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
                                p[4] = 0; // no message
                                tunnelsend(b, (p - b) + 5, t); // send it

+
+                               LOG(3, s, session[s].tunnel, "   PAP User %s authentication %s.\n", session[s].user,
+                                               (r_code == AccessAccept) ? "allowed" : "denied");

                        }
 
                        }
 

-                       if (*buf == 2)
+                       if (r_code == AccessAccept)

                        {
                                // Login successful
                                // Extract IP, routes, etc
                        {
                                // 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)
                                        {
                                {
                                        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;
                                                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));

                                        }
                                        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(*(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
                                        }
                                        else if (*p == 136)
                                        {
                                                // DNS address

-                                               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));
+                                               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)
                                        {
                                        }
                                        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 == '.')
                                                while (n < e && (isdigit(*n) || *n == '.'))
                                                {
                                                        if (*n == '.')


@@ -516,71 +520,110 @@ void processrad(u8 *buf, int len, char socket_index)
                                                        mask = 0xFFFF0000;
                                                else
                                                        mask = 0xFFFFFF00;
                                                        mask = 0xFFFF0000;
                                                else
                                                        mask = 0xFFFFFF00;

+

                                                if (routes == MAXROUTE)
                                                {
                                                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 if (ip)
                                                {
                                                }
                                                else if (ip)
                                                {

-                                                       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);
+                                                       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++;
                                                }
                                        }
                                                        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;
                                        {
                                                // 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)
+                       else if (r_code == AccessReject)

                        {
                        {

-                               log(2, 0, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);
+                               LOG(2, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);

 //FIXME: We should tear down the session here!
                                break;
                        }
 //FIXME: We should tear down the session here!
                                break;
                        }


@@ -588,22 +631,22 @@ void processrad(u8 *buf, int len, char socket_index)
                        if (!session[s].dns1 && config->default_dns1)
                        {
                                session[s].dns1 = htonl(config->default_dns1);
                        if (!session[s].dns1 && config->default_dns1)
                        {
                                session[s].dns1 = htonl(config->default_dns1);

-                               log(3, 0, s, t, "   Sending dns1 = %s\n", inet_toa(config->default_dns1));
+                               LOG(3, s, t, "   Sending dns1 = %s\n", fmtaddr(config->default_dns1, 0));

                        }
                        if (!session[s].dns2 && config->default_dns2)
                        {
                                session[s].dns2 = htonl(config->default_dns2);
                        }
                        if (!session[s].dns2 && config->default_dns2)
                        {
                                session[s].dns2 = htonl(config->default_dns2);

-                               log(3, 0, s, t, "   Sending dns2 = %s\n", inet_toa(config->default_dns2));
+                               LOG(3, s, t, "   Sending dns2 = %s\n", fmtaddr(config->default_dns2, 0));

                        }
 
                        // Valid Session, set it up
                        }
 
                        // Valid Session, set it up

-                       session[s].sid = 0;
+                       session[s].unique_id = 0;

                        sessionsetup(t, s);
                }
                else
                {
                                // An ack for a stop or start record.
                        sessionsetup(t, s);
                }
                else
                {
                                // 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]);
+                       LOG(3, s, t, "   RADIUS accounting ack recv in state %s\n", radius_state(radius[r].state));

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


@@ -613,15 +656,15 @@ void processrad(u8 *buf, int len, char socket_index)
 }
 
 // Send a retry for RADIUS/CHAP message
 }
 
 // Send a retry for RADIUS/CHAP message

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

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

-#ifdef STAT_CALLS
-       STAT(call_radiusretry);
-#endif
-       if (s)
-               t = session[s].tunnel;
+
+       CSTAT(radiusretry);
+
+       if (s) t = session[s].tunnel;
+

        radius[r].retry = backoff(radius[r].try + 1);
        switch (radius[r].state)
        {
        radius[r].retry = backoff(radius[r].try + 1);
        switch (radius[r].state)
        {


@@ -645,23 +688,7 @@ void radiusretry(u16 r)
                case RADIUSWAIT:           // waiting timeout before available, in case delayed reply from RADIUS server
                        // free up RADIUS task
                        radiusclear(r, s);
                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);
+                       LOG(3, s, session[s].tunnel, "Freeing up radius session %d\n", r);

                        break;
        }
 }
                        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, 0);
-       }
-}