restart BGP on receipt of CEASE
[l2tpns.git] / radius.c
index 17488ac..7dcaf67 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.21 2005-01-05 13:45:49 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.41 2005-08-31 12:41:09 bodea Exp $";
 
 #include <time.h>
 #include <stdio.h>
 
 #include <time.h>
 #include <stdio.h>
@@ -12,11 +12,13 @@ char const *cvs_id_radius = "$Id: radius.c,v 1.21 2005-01-05 13:45:49 bodea Exp
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <netinet/in.h>
+#include <errno.h>
 #include "md5.h"
 #include "constants.h"
 #include "l2tpns.h"
 #include "plugin.h"
 #include "util.h"
 #include "md5.h"
 #include "constants.h"
 #include "l2tpns.h"
 #include "plugin.h"
 #include "util.h"
+#include "cluster.h"
 
 extern radiust *radius;
 extern sessiont *session;
 
 extern radiust *radius;
 extern sessiont *session;
@@ -29,9 +31,9 @@ extern ip_filtert *ip_filters;
 void initrad(void)
 {
        int i;
 void initrad(void)
 {
        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++)
+       LOG(3, 0, 0, "Creating %d sockets for RADIUS queries\n", RADIUS_FDS);
+       radfds = calloc(sizeof(int), RADIUS_FDS);
+       for (i = 0; i < RADIUS_FDS; i++)
        {
                int flags;
                radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
        {
                int flags;
                radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -42,7 +44,7 @@ void initrad(void)
 
 void radiusclear(uint16_t r, sessionidt s)
 {
 
 void radiusclear(uint16_t r, sessionidt s)
 {
-       if (s) session[s].radius = 0;
+       if (s) sess_local[s].radius = 0;
        memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL;
 }
 
        memset(&radius[r], 0, sizeof(radius[r])); // radius[r].state = RADIUSNULL;
 }
 
@@ -51,7 +53,7 @@ static uint16_t get_free_radius()
        int count;
        static uint32_t next_radius_id = 0;
 
        int count;
        static uint32_t next_radius_id = 0;
 
-       for (count = MAXRADIUS; count > 0 ; --count)
+       for (count = MAXRADIUS; count > 0; --count)
        {
                ++next_radius_id;               // Find the next ID to check.
                if (next_radius_id >= MAXRADIUS)
        {
                ++next_radius_id;               // Find the next ID to check.
                if (next_radius_id >= MAXRADIUS)
@@ -69,7 +71,7 @@ static uint16_t get_free_radius()
 
 uint16_t radiusnew(sessionidt s)
 {
 
 uint16_t radiusnew(sessionidt s)
 {
-       uint16_t r = session[s].radius;
+       uint16_t r = sess_local[s].radius;
 
        /* re-use */
        if (r)
 
        /* re-use */
        if (r)
@@ -86,11 +88,13 @@ uint16_t radiusnew(sessionidt s)
        };
 
        memset(&radius[r], 0, sizeof(radius[r]));
        };
 
        memset(&radius[r], 0, sizeof(radius[r]));
-       session[s].radius = r;
+       sess_local[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.
 
        radius[r].session = s;
        radius[r].state = RADIUSWAIT;
        radius[r].retry = TIME + 1200; // Wait at least 120 seconds to re-claim this.
 
+       random_data(radius[r].auth, sizeof(radius[r].auth));
+
        LOG(3, s, session[s].tunnel, "Allocated radius %d\n", r);
        return r;
 }
        LOG(3, s, session[s].tunnel, "Allocated radius %d\n", r);
        return r;
 }
@@ -130,7 +134,7 @@ void radiussend(uint16_t r, uint8_t state)
                radius[r].try = 0;
 
        radius[r].state = state;
                radius[r].try = 0;
 
        radius[r].state = state;
-       radius[r].retry = backoff(radius[r].try++);
+       radius[r].retry = backoff(radius[r].try++) + 20; // 3s, 4s, 6s, 10s...
        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);
        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);
@@ -140,7 +144,7 @@ void radiussend(uint16_t r, uint8_t state)
                if (s)
                {
                        if (state == RADIUSAUTH)
                if (s)
                {
                        if (state == RADIUSAUTH)
-                               sessionshutdown(s, "RADIUS timeout");
+                               sessionshutdown(s, "RADIUS timeout.", 3, 0);
                        else
                        {
                                LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
                        else
                        {
                                LOG(1, s, session[s].tunnel, "RADIUS timeout, but in state %s so don't timeout session\n",
@@ -161,11 +165,12 @@ void radiussend(uint16_t r, uint8_t state)
        switch (state)
        {
                case RADIUSAUTH:
        switch (state)
        {
                case RADIUSAUTH:
-                       b[0] = 1;               // access request
+                       b[0] = AccessRequest;               // access request
                        break;
                case RADIUSSTART:
                case RADIUSSTOP:
                        break;
                case RADIUSSTART:
                case RADIUSSTOP:
-                       b[0] = 4;               // accounting request
+               case RADIUSINTERIM:
+                       b[0] = AccountingRequest;               // accounting request
                        break;
                default:
                        LOG(0, 0, 0, "Unknown radius state %d\n", state);
                        break;
                default:
                        LOG(0, 0, 0, "Unknown radius state %d\n", state);
@@ -177,7 +182,7 @@ void radiussend(uint16_t r, uint8_t state)
        {
                *p = 1;                 // user name
                p[1] = strlen(session[s].user) + 2;
        {
                *p = 1;                 // user name
                p[1] = strlen(session[s].user) + 2;
-               strcpy(p + 2, session[s].user);
+               strcpy((char *) p + 2, session[s].user);
                p += p[1];
        }
        if (state == RADIUSAUTH)
                p += p[1];
        }
        if (state == RADIUSAUTH)
@@ -207,13 +212,13 @@ void radiussend(uint16_t r, uint8_t state)
                                while (p < pl)
                                {
                                        MD5_CTX ctx;
                                while (p < pl)
                                {
                                        MD5_CTX ctx;
-                                       MD5Init(&ctx);
-                                       MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+                                       MD5_Init(&ctx);
+                                       MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
                                        if (p)
                                        if (p)
-                                               MD5Update(&ctx, pass + p - 16, 16);
+                                               MD5_Update(&ctx, pass + p - 16, 16);
                                        else
                                        else
-                                               MD5Update(&ctx, radius[r].auth, 16);
-                                       MD5Final(hash, &ctx);
+                                               MD5_Update(&ctx, radius[r].auth, 16);
+                                       MD5_Final(hash, &ctx);
                                        do
                                        {
                                                pass[p] ^= hash[p & 15];
                                        do
                                        {
                                                pass[p] ^= hash[p & 15];
@@ -229,46 +234,73 @@ void radiussend(uint16_t r, uint8_t state)
                        p += p[1];
                }
        }
                        p += p[1];
                }
        }
-       else if (state == RADIUSSTART || state == RADIUSSTOP)
-       {                          // accounting
-               *p = 40;                // accounting type
+       else if (state == RADIUSSTART || state == RADIUSSTOP || state == RADIUSINTERIM)
+       {                       // accounting
+               *p = 40;        // accounting type
                p[1] = 6;
                p[1] = 6;
-               *(uint32_t *) (p + 2) = htonl((state == RADIUSSTART) ? 1 : 2);
+               *(uint32_t *) (p + 2) = htonl(state - RADIUSSTART + 1); // start=1, stop=2, interim=3
                p += p[1];
                if (s)
                {
                p += p[1];
                if (s)
                {
-                       *p = 44;           // session ID
+                       *p = 44;        // session ID
                        p[1] = 18;
                        p[1] = 18;
-                       sprintf(p + 2, "%08X%08X", session[s].id, session[s].opened);
+                       sprintf((char *) p + 2, "%08X%08X", session[s].unique_id, session[s].opened);
                        p += p[1];
                        p += p[1];
-                       if (state == RADIUSSTOP)
-                       {                // stop
-                               *p = 42;      // input octets
+                       if (state == RADIUSSTART)
+                       {                       // start
+                               *p = 41;        // delay
+                               p[1] = 6;
+                               *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
+                               p += p[1];
+                               sess_local[s].last_interim = time_now; // Setup "first" Interim
+                       }
+                       else
+                       {                       // stop, interim
+                               *p = 42;        // input octets
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].cin);
                                p += p[1];
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].cin);
                                p += p[1];
-                               *p = 43;      // output octets
+
+                               *p = 43;        // output octets
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].cout);
                                p += p[1];
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].cout);
                                p += p[1];
-                               *p = 46;      // session time
+
+                               *p = 46;        // session time
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
                                p += p[1];
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
                                p += p[1];
-                               *p = 47;      // input packets
+
+                               *p = 47;        // input packets
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].pin);
                                p += p[1];
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].pin);
                                p += p[1];
-                               *p = 48;      // output spackets
+
+                               *p = 48;        // output packets
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].pout);
                                p += p[1];
                                p[1] = 6;
                                *(uint32_t *) (p + 2) = htonl(session[s].pout);
                                p += p[1];
-                       }
-                       else
-                       {                // start
-                               *p = 41;      // delay
+
+                               *p = 52;        // input gigawords
                                p[1] = 6;
                                p[1] = 6;
-                               *(uint32_t *) (p + 2) = htonl(time(NULL) - session[s].opened);
+                               *(uint32_t *) (p + 2) = htonl(session[s].cin_wrap);
+                               p += p[1];
+
+                               *p = 53;        // output gigawords
+                               p[1] = 6;
+                               *(uint32_t *) (p + 2) = htonl(session[s].cout_wrap);
+                               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((char *) p + 8, "intercept=%s:%d",
+                                       fmtaddr(session[s].snoop_ip, 0), session[s].snoop_port);
+
+                               p[1] = p[7] + 6;
                                p += p[1];
                        }
                }
                                p += p[1];
                        }
                }
@@ -291,21 +323,14 @@ void radiussend(uint16_t r, uint8_t state)
        {
                *p = 30;                // called
                p[1] = strlen(session[s].called) + 2;
        {
                *p = 30;                // called
                p[1] = strlen(session[s].called) + 2;
-               strcpy(p + 2, session[s].called);
-               p += p[1];
-       }
-       if (*radius[r].calling)
-       {
-               *p = 31;                // calling
-               p[1] = strlen(radius[r].calling) + 2;
-               strcpy(p + 2, radius[r].calling);
+               strcpy((char *) p + 2, session[s].called);
                p += p[1];
        }
        else if (*session[s].calling)
        {
                *p = 31;                // calling
                p[1] = strlen(session[s].calling) + 2;
                p += p[1];
        }
        else if (*session[s].calling)
        {
                *p = 31;                // calling
                p[1] = strlen(session[s].calling) + 2;
-               strcpy(p + 2, session[s].calling);
+               strcpy((char *) p + 2, session[s].calling);
                p += p[1];
        }
        // NAS-IP-Address
                p += p[1];
        }
        // NAS-IP-Address
@@ -319,15 +344,15 @@ void radiussend(uint16_t r, uint8_t state)
        if (state != RADIUSAUTH)
        {
            // Build auth for accounting packet
        if (state != RADIUSAUTH)
        {
            // Build auth for accounting packet
-           char z[16] = {0};
-           char hash[16] = {0};
+           uint8_t z[16] = {0};
+           uint8_t hash[16] = {0};
            MD5_CTX ctx;
            MD5_CTX ctx;
-           MD5Init(&ctx);
-           MD5Update(&ctx, b, 4);
-           MD5Update(&ctx, z, 16);
-           MD5Update(&ctx, b + 20, (p - b) - 20);
-           MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
-           MD5Final(hash, &ctx);
+           MD5_Init(&ctx);
+           MD5_Update(&ctx, b, 4);
+           MD5_Update(&ctx, z, 16);
+           MD5_Update(&ctx, b + 20, (p - b) - 20);
+           MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+           MD5_Final(hash, &ctx);
            memcpy(b + 4, hash, 16);
            memcpy(radius[r].auth, hash, 16);
        }
            memcpy(b + 4, hash, 16);
            memcpy(radius[r].auth, hash, 16);
        }
@@ -337,9 +362,7 @@ void radiussend(uint16_t r, uint8_t state)
        {
                // get radius port
                uint16_t port = config->radiusport[(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
+               // assume RADIUS accounting port is the authentication port +1
                addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
        }
 
                addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
        }
 
@@ -347,10 +370,51 @@ void radiussend(uint16_t r, uint8_t state)
        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
+static void handle_avpair(sessionidt s, uint8_t *avp, int len)
+{
+       uint8_t *key = avp;
+       uint8_t *value = memchr(avp, '=', len);
+       uint8_t tmp[2048] = "";
+
+       if (value)
+       {
+               *value++ = 0;
+               len -= value - key;
+       }
+       else
+       {
+               value = tmp;
+               len = 0;
+       }
+
+       // strip quotes
+       if (len > 2 && (*value == '"' || *value == '\'') && value[len - 1] == *value)
+       {
+               value++;
+               len--;
+               value[len - 1] = 0;
+       }
+       // copy and null terminate
+       else if (len < sizeof(tmp) - 1)
+       {
+               memcpy(tmp, value, len);
+               tmp[len] = 0;
+               value = tmp;
+       }
+       else
+               return;
+       
+       // Run hooks
+       {
+               struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], (char *) key, (char *) value };
+               run_plugins(PLUGIN_RADIUS_RESPONSE, &p);
+       }
+}
+
 // process RADIUS response
 void processrad(uint8_t *buf, int len, char socket_index)
 {
 // process RADIUS response
 void processrad(uint8_t *buf, int len, char socket_index)
 {
-       uint8_t b[MAXCONTROL];
+       uint8_t b[MAXETHER];
        MD5_CTX ctx;
        uint16_t r;
        sessionidt s;
        MD5_CTX ctx;
        uint16_t r;
        sessionidt s;
@@ -383,18 +447,19 @@ void processrad(uint8_t *buf, int len, char socket_index)
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
-       if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART && radius[r].state != RADIUSSTOP)
+       if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART
+           && radius[r].state != RADIUSSTOP && radius[r].state != RADIUSINTERIM)
        {
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
        t = session[s].tunnel;
        {
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
        t = session[s].tunnel;
-       MD5Init(&ctx);
-       MD5Update(&ctx, buf, 4);
-       MD5Update(&ctx, radius[r].auth, 16);
-       MD5Update(&ctx, buf + 20, len - 20);
-       MD5Update(&ctx, config->radiussecret, strlen(config->radiussecret));
-       MD5Final(hash, &ctx);
+       MD5_Init(&ctx);
+       MD5_Update(&ctx, buf, 4);
+       MD5_Update(&ctx, radius[r].auth, 16);
+       MD5_Update(&ctx, buf + 20, len - 20);
+       MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+       MD5_Final(hash, &ctx);
        do {
                if (memcmp(hash, buf + 4, 16))
                {
        do {
                if (memcmp(hash, buf + 4, 16))
                {
@@ -403,7 +468,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                }
 
                if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) ||
                }
 
                if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) ||
-                       ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP) && r_code != AccountingResponse))
+                       ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP || radius[r].state == RADIUSINTERIM) && r_code != AccountingResponse))
                {
                        LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response %s\n", radius_code(r_code));
                        return; // We got something we didn't expect. Let the timeouts take
                {
                        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
@@ -428,7 +493,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        if (radius[r].chap)
                        {
                                // CHAP
                        if (radius[r].chap)
                        {
                                // CHAP
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP);
                                if (!p) return; // Abort!
 
                                *p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
                                if (!p) return; // Abort!
 
                                *p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
@@ -442,7 +507,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        else
                        {
                                // PAP
                        else
                        {
                                // PAP
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP);
                                if (!p) return;         // Abort!
 
                                // ack/nak
                                if (!p) return;         // Abort!
 
                                // ack/nak
@@ -472,6 +537,9 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                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));
                                                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)
                                        {
                                        }
                                        else if (*p == 135)
                                        {
@@ -540,48 +608,46 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        else if (*p == 11)
                                        {
                                                // Filter-Id
                                        else if (*p == 11)
                                        {
                                                // Filter-Id
-                                               char *filter = p + 2;
+                                               char *filter = (char *) p + 2;
                                                int l = p[1] - 2;
                                                char *suffix;
                                                int l = p[1] - 2;
                                                char *suffix;
-                                               uint8_t *f = 0;
-                                               int i;
+                                               int f;
+                                               uint8_t *fp = 0;
 
                                                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))
 
                                                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;
+                                                               fp = &session[s].filter_in;
                                                        else if (l - b == 4 && !memcmp("out", suffix+1, 3))
                                                        else if (l - b == 4 && !memcmp("out", suffix+1, 3))
-                                                               f = &session[s].filter_out;
+                                                               fp = &session[s].filter_out;
 
                                                        l = b;
                                                }
 
 
                                                        l = b;
                                                }
 
-                                               if (!f)
+                                               if (!fp)
                                                {
                                                        LOG(3, s, session[s].tunnel, "    Invalid filter\n");
                                                        continue;
                                                }
 
                                                {
                                                        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
+                                               if ((f = find_filter(filter, l)) < 0 || !*ip_filters[f].name)
+                                               {
                                                        LOG(3, s, session[s].tunnel, "    Unknown filter\n");
                                                        LOG(3, s, session[s].tunnel, "    Unknown filter\n");
-
+                                               }
+                                               else
+                                               {
+                                                       *fp = f + 1;
+                                                       ip_filters[f].used++;
+                                               }
                                        }
                                        else if (*p == 26 && p[1] >= 7)
                                        {
                                                // Vendor-Specific Attribute
                                                int vendor = ntohl(*(int *)(p + 2));
                                                char attrib = *(p + 6);
                                        }
                                        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;
-                                               char *avpair, *value, *key, *newp;
+                                               int attrib_length = *(p + 7) - 2;
 
                                                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)
 
                                                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)
@@ -590,60 +656,63 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                        continue;
                                                }
 
                                                        continue;
                                                }
 
-                                               if (attrib_length < 0) continue;
+                                               if (attrib_length > 0)
+                                               {
+                                                       LOG(3, s, session[s].tunnel, "      Cisco-AVPair value: %.*s\n",
+                                                               attrib_length, p + 8);
 
 
-                                               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;
+                                                       handle_avpair(s, p + 8, attrib_length);
+                                               }
+                                       }
+                                       else if (*p == 99)
+                                       {
+                                               // Framed-IPv6-Route
+                                               struct in6_addr r6;
+                                               int prefixlen;
+                                               uint8_t *n = p + 2;
+                                               uint8_t *e = p + p[1];
+                                               uint8_t *m = memchr(n, '/', e - p);
 
 
-                                                       // Trim quotes off reply string
-                                                       if (*value == '\'' || *value == '\"')
-                                                       {
-                                                               char *x;
-                                                               value++;
-                                                               x = value + strlen(value) - 1;
-                                                               if (*x == '\'' || *x == '\"')
-                                                                       *x = 0;
-                                                       }
+                                               *m++ = 0;
+                                               inet_pton(AF_INET6, (char *) n, &r6);
 
 
-                                                       // 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);
+                                               prefixlen = 0;
+                                               while (m < e && isdigit(*m)) {
+                                                       prefixlen = prefixlen * 10 + *m++ - '0';
+                                               }
+
+                                               if (prefixlen)
+                                               {
+                                                       LOG(3, s, session[s].tunnel,
+                                                               "   Radius reply contains route for %s/%d\n",
+                                                               n, prefixlen);
+                                                       session[s].ipv6route = r6;
+                                                       session[s].ipv6prefixlen = prefixlen;
+                                               }
                                        }
                                }
                        }
                        else if (r_code == AccessReject)
                        {
                                        }
                                }
                        }
                        else if (r_code == AccessReject)
                        {
-                               LOG(2, s, session[s].tunnel, "   Authentication denied for %s\n", session[s].user);
-//FIXME: We should tear down the session here!
+                               LOG(2, s, session[s].tunnel, "   Authentication rejected for %s\n", session[s].user);
+                               sessionkill(s, "Authentication rejected");
                                break;
                        }
 
                        if (!session[s].dns1 && config->default_dns1)
                        {
                                break;
                        }
 
                        if (!session[s].dns1 && config->default_dns1)
                        {
-                               session[s].dns1 = htonl(config->default_dns1);
+                               session[s].dns1 = ntohl(config->default_dns1);
                                LOG(3, s, t, "   Sending dns1 = %s\n", fmtaddr(config->default_dns1, 0));
                        }
                        if (!session[s].dns2 && config->default_dns2)
                        {
                                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);
+                               session[s].dns2 = ntohl(config->default_dns2);
                                LOG(3, s, t, "   Sending dns2 = %s\n", fmtaddr(config->default_dns2, 0));
                        }
 
                        // Valid Session, set it up
                        session[s].unique_id = 0;
                                LOG(3, s, t, "   Sending dns2 = %s\n", fmtaddr(config->default_dns2, 0));
                        }
 
                        // Valid Session, set it up
                        session[s].unique_id = 0;
-                       sessionsetup(t, s);
+                       sessionsetup(s, t);
                }
                else
                {
                }
                else
                {
@@ -667,30 +736,324 @@ void radiusretry(uint16_t r)
 
        if (s) t = session[s].tunnel;
 
 
        if (s) t = session[s].tunnel;
 
-       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);
+               case RADIUSCHAP:        // sending CHAP down PPP
+                       sendchap(s, t);
                        break;
                        break;
-               case RADIUSSTART:          // sending start accounting to RADIUS server
-                       radiussend(r, RADIUSSTART);
-                       break;
-               case RADIUSSTOP:           // sending stop accounting to RADIUS server
-                       radiussend(r, RADIUSSTOP);
+               case RADIUSAUTH:        // sending auth to RADIUS server
+               case RADIUSSTART:       // sending start accounting to RADIUS server
+               case RADIUSSTOP:        // sending stop accounting to RADIUS server
+               case RADIUSINTERIM:     // sending interim accounting to RADIUS server
+                       radiussend(r, radius[r].state);
                        break;
                default:
                        break;
                default:
-               case RADIUSNULL:           // Not in use
-               case RADIUSWAIT:           // waiting timeout before available, in case delayed reply from RADIUS server
+               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;
        }
 }
                        // free up RADIUS task
                        radiusclear(r, s);
                        LOG(3, s, session[s].tunnel, "Freeing up radius session %d\n", r);
                        break;
        }
 }
+
+extern int daefd;
+
+void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen)
+{
+       int i, r_code, r_id, length, attribute_length;
+       uint8_t vector[16], hash[16], *packet, attribute;
+       MD5_CTX ctx;
+       char username[MAXUSER] = "";
+       in_addr_t nas = 0;
+       in_addr_t ip = 0;
+       uint32_t port = 0;
+       uint32_t error = 0;
+       sessionidt s = 0;
+       tunnelidt t;
+       int fin = -1;
+       int fout = -1;
+       uint8_t *avpair[64];
+       int avpair_len[sizeof(avpair)/sizeof(*avpair)];
+       int avp = 0;
+       int auth_only = 0;
+       uint8_t *p;
+
+       LOG(3, 0, 0, "DAE request from %s\n", fmtaddr(addr->sin_addr.s_addr, 0));
+       LOG_HEX(5, "DAE Request", buf, len);
+
+       if (len < 20 || len < ntohs(*(uint16_t *) (buf + 2)))
+       {
+               LOG(1, 0, 0, "Duff DAE request length %d\n", len);
+               return;
+       }
+
+       r_code = buf[0]; // request type
+       r_id = buf[1]; // radius indentifier.
+
+       if (r_code != DisconnectRequest && r_code != CoARequest)
+       {
+               LOG(1, 0, 0, "Unrecognised DAE request %s\n", radius_code(r_code));
+               return;
+       }
+
+       if (!config->cluster_iam_master)
+       {
+               master_forward_dae_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
+               return;
+       }
+
+       len = ntohs(*(uint16_t *) (buf + 2));
+
+       LOG(3, 0, 0, "Received DAE %s, id %d\n", radius_code(r_code), r_id);
+
+       // check authenticator
+       memcpy(vector, buf + 4, 16);
+       memset(buf + 4, 0, 16);
+
+       i = strlen(config->radiussecret);
+       if (i > 16) i = 16;
+
+       MD5_Init(&ctx);
+       MD5_Update(&ctx, buf, len);
+       MD5_Update(&ctx, config->radiussecret, i);
+       MD5_Final(hash, &ctx);
+       if (memcmp(hash, vector, 16) != 0)
+       {
+               LOG(1, 0, 0, "Incorrect vector in DAE request (wrong secret in radius config?)\n");
+               return;
+       }
+
+       // unpack attributes
+       packet = buf + 20;
+       length = len - 20;
+
+       while (length > 0)
+       {
+               attribute = *packet++;
+               attribute_length = *packet++;
+               if (attribute_length < 2)
+                       break;
+
+               length -= attribute_length;
+               attribute_length -= 2;
+               switch (attribute)
+               {
+               case 1: /* username */
+                       len = attribute_length < MAXUSER ? attribute_length : MAXUSER - 1;
+                       memcpy(username, packet, len);
+                       username[len] = 0;
+                       LOG(4, 0, 0, "    Received DAE User-Name: %s\n", username);
+                       break;
+
+               case 4: /* nas ip address */
+                       nas = *(uint32_t *) packet; // net order
+                       if (nas != config->bind_address)
+                               error = 403; // NAS identification mismatch
+
+                       LOG(4, 0, 0, "    Received DAE NAS-IP-Address: %s\n", fmtaddr(nas, 0));
+                       break;
+
+               case 5: /* nas port */
+                       port = ntohl(*(uint32_t *) packet);
+                       if (port < 1 || port > MAXSESSION)
+                               error = 404;
+
+                       LOG(4, 0, 0, "    Received DAE NAS-Port: %u\n", port);
+                       break;
+
+               case 6: /* service type */
+                       {
+                               uint32_t service_type = ntohl(*(uint32_t *) packet);
+                               auth_only = service_type == 8; // Authenticate only
+
+                               LOG(4, 0, 0, "    Received DAE Service-Type: %u\n", service_type);
+                       }
+                       break;
+
+               case 8: /* ip address */
+                       ip = *(uint32_t *) packet; // net order
+                       LOG(4, 0, 0, "    Received DAE Framed-IP-Address: %s\n", fmtaddr(ip, 0));
+                       break;
+
+               case 11: /* filter id */
+                       LOG(4, 0, 0, "    Received DAE Filter-Id: %.*s\n", attribute_length, packet);
+                       if (!(p = memchr(packet, '.', attribute_length)))
+                       {
+                               error = 404; // invalid request
+                               break;
+                       }
+
+                       len = p - packet;
+                       i = find_filter((char *) packet, len);
+                       if (i < 0 || !*ip_filters[i].name)
+                       {
+                               error = 404;
+                               break;
+                       }
+
+                       if (!memcmp(p, ".in", attribute_length - len))
+                               fin = i + 1;
+                       else if (!memcmp(p, ".out", attribute_length - len))
+                               fout = i + 1;
+                       else
+                               error = 404;
+
+                       break;
+
+               case 26: /* vendor specific */
+                       if (attribute_length >= 6
+                           && ntohl(*(uint32_t *) packet) == 9 // Cisco
+                           && *(packet + 4) == 1               // Cisco-AVPair
+                           && *(packet + 5) >= 2)              // length
+                       {
+                               int len = *(packet + 5) - 2;
+                               uint8_t *a = packet + 6;
+
+                               LOG(4, 0, 0, "    Received DAE Cisco-AVPair: %.*s\n", len, a);
+                               if (avp < sizeof(avpair)/sizeof(*avpair) - 1)
+                               {
+                                       avpair[avp] = a;
+                                       avpair_len[avp++] = len;
+                               }
+                       }
+                       break;
+               }
+
+               packet += attribute_length;
+       }
+
+       if (!error && auth_only)
+       {
+               if (fin != -1 || fout != -1 || avp)
+                       error = 401; // unsupported attribute
+               else
+                       error = 405; // unsupported service
+       }
+
+       if (!error && !(port || ip || *username))
+               error = 402; // missing attribute
+
+       // exact match for SID if given
+       if (!error && port)
+       {
+               s = port;
+               if (!session[s].opened)
+                       error = 503; // not found
+       }
+
+       if (!error && ip)
+       {
+               // find/check session by IP
+               i = sessionbyip(ip);
+               if (!i || (s && s != i)) // not found or mismatching port
+                       error = 503;
+               else
+                       s = i;
+       }
+
+       if (!error && *username)
+       {
+               if (s)
+               {
+                       if (strcmp(session[s].user, username))
+                               error = 503;
+               }
+               else if (!(s = sessionbyuser(username)))
+                       error = 503;
+       }
+
+       t = session[s].tunnel;
+
+       switch (r_code)
+       {
+       case DisconnectRequest: // Packet of Disconnect/Death
+               if (error)
+               {
+                       r_code = DisconnectNAK;
+                       break;
+               }
+
+               LOG(3, s, t, "    DAE Disconnect %d (%s)\n", s, session[s].user);
+               r_code = DisconnectACK;
+
+               sessionshutdown(s, "Requested by PoD", 3, 0); // disconnect session
+               break;
+
+       case CoARequest: // Change of Authorization
+               if (error)
+               {
+                       r_code = CoANAK;
+                       break;
+               }
+
+               LOG(3, s, t, "    DAE Change %d (%s)\n", s, session[s].user);
+               r_code = CoAACK;
+       
+               // reset
+               {
+                       struct param_radius_reset p = { &tunnel[session[s].tunnel], &session[s] };
+                       run_plugins(PLUGIN_RADIUS_RESET, &p);
+               }
+
+               // apply filters
+               if (fin == -1)
+                       fin = 0;
+               else
+                       LOG(3, s, t, "        Filter in %d (%s)\n", fin, ip_filters[fin - 1].name);
+
+               if (fout == -1)
+                       fout = 0;
+               else
+                       LOG(3, s, t, "        Filter out %d (%s)\n", fout, ip_filters[fout - 1].name);
+
+               filter_session(s, fin, fout);
+
+               // process cisco av-pair(s)
+               for (i = 0; i < avp; i++)
+               {
+                       LOG(3, s, t, "        Cisco-AVPair: %.*s\n", avpair_len[i], avpair[i]);
+                       handle_avpair(s, avpair[i], avpair_len[i]);
+               }
+
+               cluster_send_session(s);
+               break;
+       }
+
+       // send response
+       packet = buf;
+       *packet++ = r_code;
+       *packet++ = r_id;
+       packet += 2;
+       memset(packet, 0, 16);
+       packet += 16;
+       len = 20;
+
+       // add attributes
+       if (error)
+       {
+               // add error cause
+               *packet++ = 101;
+               *packet++ = 6;
+               *(uint32_t *) packet = htonl(error);
+               len += 6;
+       }
+
+       *((uint16_t *)(buf + 2)) = htons(len);
+
+       // make vector
+       i = strlen(config->radiussecret);
+       if (i > 16) i = 16;
+
+       MD5_Init(&ctx);
+       MD5_Update(&ctx, buf, len);
+       MD5_Update(&ctx, config->radiussecret, i);
+       MD5_Final(hash, &ctx);
+       memcpy(buf + 4, hash, 16);
+
+       LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id);
+
+       // send DAE response
+       if (sendto(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen) < 0)
+               LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno));
+}