Update version
[l2tpns.git] / radius.c
index 5d94720..4eda15f 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,7 +1,5 @@
 // L2TPNS Radius Stuff
 
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.29 2005/05/05 10:02:08 bodea Exp $";
-
 #include <time.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -12,11 +10,18 @@ char const *cvs_id_radius = "$Id: radius.c,v 1.29 2005/05/05 10:02:08 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 "md5.h"
 #include "constants.h"
+#include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
 #include "util.h"
 #include "l2tpns.h"
 #include "plugin.h"
 #include "util.h"
+#include "cluster.h"
+
+#include "l2tplac.h"
+#include "pppoe.h"
 
 extern radiust *radius;
 extern sessiont *session;
 
 extern radiust *radius;
 extern sessiont *session;
@@ -25,18 +30,72 @@ extern configt *config;
 extern int *radfds;
 extern ip_filtert *ip_filters;
 
 extern int *radfds;
 extern ip_filtert *ip_filters;
 
+static const hasht zero;
+
+static void calc_auth(const void *buf, size_t len, const uint8_t *in, uint8_t *out)
+{
+       MD5_CTX ctx;
+
+       MD5_Init(&ctx);
+       MD5_Update(&ctx, (void *)buf, 4); // code, id, length
+       MD5_Update(&ctx, (void *)in, 16); // auth
+       MD5_Update(&ctx, (void *)(buf + 20), len - 20);
+       MD5_Update(&ctx, config->radiussecret, strlen(config->radiussecret));
+       MD5_Final(out, &ctx);
+}
+
 // 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, "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++)
+       uint16_t port = 0;
+       uint16_t min = config->radius_bind_min;
+       uint16_t max = config->radius_bind_max;
+       int inc = 1;
+       struct sockaddr_in addr;
+
+       if (min)
+       {
+               port = min;
+               if (!max)
+                       max = ~0 - 1;
+       }
+       else if (max) /* no minimum specified, bind from max down */
+       {
+               port = max;
+               min = 1;
+               inc = -1;
+       }
+
+       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);
                flags = fcntl(radfds[i], F_GETFL, 0);
                fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
        {
                int flags;
                radfds[i] = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
                flags = fcntl(radfds[i], F_GETFL, 0);
                fcntl(radfds[i], F_SETFL, flags | O_NONBLOCK);
+
+               if (port)
+               {
+                       int b;
+
+                       memset(&addr, 0, sizeof(addr));
+                       addr.sin_family = AF_INET;
+                       addr.sin_addr.s_addr = INADDR_ANY;
+
+                       do {
+                               addr.sin_port = htons(port);
+                               if ((b = bind(radfds[i], (struct sockaddr *) &addr, sizeof(addr))) < 0)
+                               {
+                                       if ((port += inc) < min || port > max)
+                                       {
+                                               LOG(0, 0, 0, "Can't bind RADIUS socket in range %u-%u\n", min, max);
+                                               exit(1);
+                                       }
+                               }
+                       } while (b < 0);
+               }
        }
 }
 
        }
 }
 
@@ -51,7 +110,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)
@@ -91,6 +150,8 @@ uint16_t radiusnew(sessionidt s)
        radius[r].state = RADIUSWAIT;
        radius[r].retry = TIME + 1200; // Wait at least 120 seconds to re-claim this.
 
        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;
 }
@@ -119,7 +180,7 @@ void radiussend(uint16_t r, uint8_t state)
                return;
        }
 
                return;
        }
 
-       if (state != RADIUSAUTH && !config->radius_accounting)
+       if (state != RADIUSAUTH && state != RADIUSJUSTAUTH && !config->radius_accounting)
        {
                // Radius accounting is turned off
                radiusclear(r, s);
        {
                // Radius accounting is turned off
                radiusclear(r, s);
@@ -130,7 +191,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);
@@ -139,8 +200,8 @@ void radiussend(uint16_t r, uint8_t state)
        {
                if (s)
                {
        {
                if (s)
                {
-                       if (state == RADIUSAUTH)
-                               sessionshutdown(s, "RADIUS timeout.", 3, 0);
+                       if (state == RADIUSAUTH || state == RADIUSJUSTAUTH)
+                               sessionshutdown(s, "RADIUS timeout.", CDN_ADMIN_DISC, TERM_REAUTHENTICATION_FAILURE);
                        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,27 +222,29 @@ void radiussend(uint16_t r, uint8_t state)
        switch (state)
        {
                case RADIUSAUTH:
        switch (state)
        {
                case RADIUSAUTH:
-                       b[0] = 1;               // access request
+               case RADIUSJUSTAUTH:
+                       b[0] = AccessRequest;               // access request
                        break;
                case RADIUSSTART:
                case RADIUSSTOP:
                case RADIUSINTERIM:
                        break;
                case RADIUSSTART:
                case RADIUSSTOP:
                case RADIUSINTERIM:
-                       b[0] = 4;               // accounting request
+                       b[0] = AccountingRequest;               // accounting request
                        break;
                default:
                        LOG(0, 0, 0, "Unknown radius state %d\n", state);
        }
        b[1] = r >> RADIUS_SHIFT;       // identifier
        memcpy(b + 4, radius[r].auth, 16);
                        break;
                default:
                        LOG(0, 0, 0, "Unknown radius state %d\n", state);
        }
        b[1] = r >> RADIUS_SHIFT;       // identifier
        memcpy(b + 4, radius[r].auth, 16);
+
        p = b + 20;
        if (s)
        {
                *p = 1;                 // user name
                p[1] = strlen(session[s].user) + 2;
        p = b + 20;
        if (s)
        {
                *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];
        }
                p += p[1];
        }
-       if (state == RADIUSAUTH)
+       if (state == RADIUSAUTH || state == RADIUSJUSTAUTH)
        {
                if (radius[r].chap)
                {
        {
                if (radius[r].chap)
                {
@@ -208,13 +271,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];
@@ -230,98 +293,169 @@ void radiussend(uint16_t r, uint8_t state)
                        p += p[1];
                }
        }
                        p += p[1];
                }
        }
-       else if (state == RADIUSSTART || state == RADIUSSTOP || state == RADIUSINTERIM)
-       {                          // accounting
-               *p = 40;                // accounting type
+       else // accounting
+       {
+               *p = 40;        // accounting type
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl(state - RADIUSSTART + 1); // start=1, stop=2, interim=3
                p += p[1];
                if (s)
                {
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl(state - RADIUSSTART + 1); // start=1, stop=2, interim=3
                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].unique_id, session[s].opened);
+                       sprintf((char *) p + 2, "%08X%08X", session[s].unique_id, session[s].opened);
                        p += p[1];
                        if (state == RADIUSSTART)
                        p += p[1];
                        if (state == RADIUSSTART)
-                       {                // start
-                               *p = 41;      // delay
+                       {                       // 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
                                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
+                       {                       // 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];
-                       }
 
 
-                       if (session[s].snoop_ip && session[s].snoop_port)
-                       {
-                               *p = 26;                                // vendor-specific
-                               *(uint32_t *) (p + 2) = htonl(9);       // Cisco
-                               p[6] = 1;                               // Cisco-Avpair
-                               p[7] = 2 + sprintf(p + 8, "intercept=%s:%d",
-                                       fmtaddr(session[s].snoop_ip, 0), session[s].snoop_port);
+                               *p = 52;        // input gigawords
+                               p[1] = 6;
+                               *(uint32_t *) (p + 2) = htonl(session[s].cin_wrap);
+                               p += p[1];
 
 
-                               p[1] = p[7] + 6;
+                               *p = 53;        // output gigawords
+                               p[1] = 6;
+                               *(uint32_t *) (p + 2) = htonl(session[s].cout_wrap);
                                p += p[1];
                                p += p[1];
+
+                               if (state == RADIUSSTOP && radius[r].term_cause)
+                               {
+                                       *p = 49; // acct-terminate-cause
+                                       p[1] = 6;
+                                       *(uint32_t *) (p + 2) = htonl(radius[r].term_cause);
+                                       p += p[1];
+
+                                       if (radius[r].term_msg)
+                                       {
+                                               *p = 26;                                // vendor-specific
+                                               *(uint32_t *) (p + 2) = htonl(9);       // Cisco
+                                               p[6] = 1;                               // Cisco-AVPair
+                                               p[7] = 2 + sprintf((char *) p + 8, "disc-cause-ext=%s", radius[r].term_msg);
+                                               p[1] = p[7] + 6;
+                                               p += p[1];
+                                       }
+                               }
+                       }
+
+                       if (session[s].classlen) {
+                               *p = 25;        // class
+                               p[1] = session[s].classlen + 2;
+                               memcpy(p + 2, session[s].class, session[s].classlen);
+                               p += p[1];
+                       }
+
+                       {
+                               struct param_radius_account acct = { &tunnel[session[s].tunnel], &session[s], &p };
+                               run_plugins(PLUGIN_RADIUS_ACCOUNT, &acct);
                        }
                }
        }
                        }
                }
        }
+
        if (s)
        {
        if (s)
        {
-               *p = 5; // NAS-Port
+               *p = 5;         // NAS-Port
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl(s);
                p += p[1];
                p[1] = 6;
                *(uint32_t *) (p + 2) = htonl(s);
                p += p[1];
-       }
-       if (s && session[s].ip)
-       {
-               *p = 8;                 // Framed-IP-Address
+
+               *p = 6;         // Service-Type
                p[1] = 6;
                p[1] = 6;
-               *(uint32_t *) (p + 2) = htonl(session[s].ip);
-               p += p[1];
-       }
-       if (*session[s].called)
-       {
-               *p = 30;                // called
-               p[1] = strlen(session[s].called) + 2;
-               strcpy(p + 2, session[s].called);
+               *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 8 : 2)); // Authenticate only or Framed-User respectevily
                p += p[1];
                p += p[1];
-       }
-       if (*radius[r].calling)
-       {
-               *p = 31;                // calling
-               p[1] = strlen(radius[r].calling) + 2;
-               strcpy(p + 2, radius[r].calling);
-               p += p[1];
-       }
-       else if (*session[s].calling)
-       {
-               *p = 31;                // calling
-               p[1] = strlen(session[s].calling) + 2;
-               strcpy(p + 2, session[s].calling);
+                  
+               *p = 7;         // Framed-Protocol
+               p[1] = htonl((state == RADIUSJUSTAUTH ? 0 : 6));
+               *(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 0 : 1)); // PPP
                p += p[1];
                p += p[1];
+
+               if (session[s].ip)
+               {
+                       *p = 8;                 // Framed-IP-Address
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].ip);
+                       p += p[1];
+               }
+
+               if (session[s].route[0].ip)
+               {
+                       int r;
+                       for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
+                       {
+                               *p = 22;        // Framed-Route
+                               p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
+                                       fmtaddr(htonl(session[s].route[r].ip), 0),
+                                       session[s].route[r].prefixlen,
+                                       fmtaddr(htonl(session[s].ip), 1)) + 2;
+
+                               p += p[1];
+                       }
+               }
+
+               if (session[s].session_timeout)
+               {
+                       *p = 27;                // Session-Timeout
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].session_timeout);
+                       p += p[1];
+               }
+
+               if (session[s].idle_timeout)
+               {
+                       *p = 28;                // Idle-Timeout
+                       p[1] = 6;
+                       *(uint32_t *) (p + 2) = htonl(session[s].idle_timeout);
+                       p += p[1];
+               }
+
+               if (*session[s].called)
+               {
+                       *p = 30;                // called
+                       p[1] = strlen(session[s].called) + 2;
+                       strcpy((char *) p + 2, session[s].called);
+                       p += p[1];
+               }
+
+               if (*session[s].calling)
+               {
+                       *p = 31;                // calling
+                       p[1] = strlen(session[s].calling) + 2;
+                       strcpy((char *) p + 2, session[s].calling);
+                       p += p[1];
+               }
        }
        }
+
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;
        // NAS-IP-Address
        *p = 4;
        p[1] = 6;
@@ -330,20 +464,11 @@ void radiussend(uint16_t r, uint8_t state)
 
        // All AVpairs added
        *(uint16_t *) (b + 2) = htons(p - b);
 
        // All AVpairs added
        *(uint16_t *) (b + 2) = htons(p - b);
-       if (state != RADIUSAUTH)
-       {
-           // Build auth for accounting packet
-           char z[16] = {0};
-           char hash[16] = {0};
-           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);
-           memcpy(b + 4, hash, 16);
-           memcpy(radius[r].auth, hash, 16);
+       if (state != RADIUSAUTH && state != RADIUSJUSTAUTH)
+       {
+               // Build auth for accounting packet
+               calc_auth(b, p - b, zero, b + 4);
+               memcpy(radius[r].auth, b + 4, 16);
        }
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        }
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
@@ -352,25 +477,67 @@ void radiussend(uint16_t r, uint8_t state)
                // get radius port
                uint16_t port = config->radiusport[(radius[r].try - 1) % config->numradiusservers];
                // assume RADIUS accounting port is the authentication port +1
                // get radius port
                uint16_t port = config->radiusport[(radius[r].try - 1) % config->numradiusservers];
                // assume RADIUS accounting port is the authentication port +1
-               addr.sin_port = htons((state == RADIUSAUTH) ? port : port+1);
+               addr.sin_port = htons((state == RADIUSAUTH || state == RADIUSJUSTAUTH) ? port : port+1);
        }
 
        LOG_HEX(5, "RADIUS Send", b, (p - b));
        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
        }
 
        LOG_HEX(5, "RADIUS Send", b, (p - b));
        sendto(radfds[r & RADIUS_MASK], b, p - b, 0, (void *) &addr, sizeof(addr));
 }
 
+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];
-       MD5_CTX ctx;
+       uint8_t b[MAXETHER];
        uint16_t r;
        sessionidt s;
        tunnelidt t = 0;
        hasht hash;
        uint16_t r;
        sessionidt s;
        tunnelidt t = 0;
        hasht hash;
-       uint8_t routes = 0;
+       int routes = 0;
+       int routes6 = 0;
        int r_code;
        int r_id;
        int r_code;
        int r_id;
+       int OpentunnelReq = 0;
 
        CSTAT(processrad);
 
 
        CSTAT(processrad);
 
@@ -395,19 +562,14 @@ void processrad(uint8_t *buf, int len, char socket_index)
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
                LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response\n");
                return;
        }
-       if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSSTART
+       if (radius[r].state != RADIUSAUTH && radius[r].state != RADIUSJUSTAUTH && 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;
            && radius[r].state != RADIUSSTOP && radius[r].state != RADIUSINTERIM)
        {
                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);
+       calc_auth(buf, len, radius[r].auth, hash);
        do {
                if (memcmp(hash, buf + 4, 16))
                {
        do {
                if (memcmp(hash, buf + 4, 16))
                {
@@ -415,7 +577,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        return; // Do nothing. On timeout, it will try the next radius server.
                }
 
                        return; // Do nothing. On timeout, it will try the next radius server.
                }
 
-               if ((radius[r].state == RADIUSAUTH && r_code != AccessAccept && r_code != AccessReject) ||
+               if (((radius[r].state == RADIUSAUTH ||radius[r].state == RADIUSJUSTAUTH) && r_code != AccessAccept && r_code != AccessReject) ||
                        ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP || radius[r].state == RADIUSINTERIM) && r_code != AccountingResponse))
                {
                        LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response %s\n", radius_code(r_code));
                        ((radius[r].state == RADIUSSTART || radius[r].state == RADIUSSTOP || radius[r].state == RADIUSINTERIM) && r_code != AccountingResponse))
                {
                        LOG(1, s, session[s].tunnel, "   Unexpected RADIUS response %s\n", radius_code(r_code));
@@ -423,7 +585,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                // care off finishing the radius session if that's really correct.
                }
 
                                // care off finishing the radius session if that's really correct.
                }
 
-               if (radius[r].state == RADIUSAUTH)
+               if (radius[r].state == RADIUSAUTH || radius[r].state == RADIUSJUSTAUTH)
                {
                        // run post-auth plugin
                        struct param_post_auth packet = {
                {
                        // run post-auth plugin
                        struct param_post_auth packet = {
@@ -437,46 +599,47 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        run_plugins(PLUGIN_POST_AUTH, &packet);
                        r_code = packet.auth_allowed ? AccessAccept : AccessReject;
 
                        run_plugins(PLUGIN_POST_AUTH, &packet);
                        r_code = packet.auth_allowed ? AccessAccept : AccessReject;
 
-                       // process auth response
-                       if (radius[r].chap)
-                       {
-                               // CHAP
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
-                               if (!p) return; // Abort!
-
-                               *p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
-                               p[1] = radius[r].id;
-                               *(uint16_t *) (p + 2) = ntohs(4); // no message
-                               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
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
-                               if (!p) return;         // Abort!
-
-                               // ack/nak
-                               *p = r_code;
-                               p[1] = radius[r].id;
-                               *(uint16_t *) (p + 2) = ntohs(5);
-                               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 (r_code == AccessAccept)
                        {
                                // Login successful
                                // Extract IP, routes, etc
                                uint8_t *p = buf + 20;
                                uint8_t *e = buf + len;
                        if (r_code == AccessAccept)
                        {
                                // Login successful
                                // Extract IP, routes, etc
                                uint8_t *p = buf + 20;
                                uint8_t *e = buf + len;
+                               uint8_t tag;
+                               uint8_t strtemp[256];
+                               lac_reset_rad_tag_tunnel_ctxt();
+
                                for (; p + 2 <= e && p[1] && p + p[1] <= e; p += p[1])
                                {
                                for (; p + 2 <= e && p[1] && p + p[1] <= e; p += p[1])
                                {
+                                       if (*p == 26 && p[1] >= 7)
+                                       {
+                                               // Vendor-Specific Attribute
+                                               uint32_t vendor = ntohl(*(int *)(p + 2));
+                                               uint8_t attrib = *(p + 6);
+                                               int attrib_length = *(p + 7) - 2;
+
+                                               LOG(4, s, session[s].tunnel, "   Radius reply contains Vendor-Specific.  Vendor=%u Attrib=%u Length=%d\n", vendor, attrib, attrib_length);
+                                               if (vendor == 9 && attrib == 1) // Cisco-AVPair
+                                               {
+                                                       if (attrib_length < 0) continue;
+                                                       LOG(3, s, session[s].tunnel, "      Cisco-AVPair value: %.*s\n",
+                                                               attrib_length, p + 8);
+
+                                                       handle_avpair(s, p + 8, attrib_length);
+                                                       continue;
+                                               }
+                                               else if (vendor == 529 && attrib >= 135 && attrib <= 136) // Ascend
+                                               {
+                                                       // handle old-format ascend DNS attributes below
+                                                       p += 6;
+                                               }
+                                               else
+                                               {
+                                                       LOG(3, s, session[s].tunnel, "      Unknown vendor-specific\n");
+                                                       continue;
+                                               }
+                                       }
+
                                        if (*p == 8)
                                        {
                                                // Framed-IP-Address
                                        if (*p == 8)
                                        {
                                                // Framed-IP-Address
@@ -508,7 +671,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                        else if (*p == 22)
                                        {
                                                // Framed-Route
                                        else if (*p == 22)
                                        {
                                                // Framed-Route
-                                               in_addr_t ip = 0, mask = 0;
+                                               in_addr_t ip = 0;
                                                uint8_t u = 0;
                                                uint8_t bits = 0;
                                                uint8_t *n = p + 2;
                                                uint8_t u = 0;
                                                uint8_t bits = 0;
                                                uint8_t *n = p + 2;
@@ -530,14 +693,13 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                        n++;
                                                        while (n < e && isdigit(*n))
                                                                bits = bits * 10 + *n++ - '0';
                                                        n++;
                                                        while (n < e && isdigit(*n))
                                                                bits = bits * 10 + *n++ - '0';
-                                                       mask = (( -1) << (32 - bits));
                                                }
                                                else if ((ip >> 24) < 128)
                                                }
                                                else if ((ip >> 24) < 128)
-                                                       mask = 0xFF0000;
+                                                       bits = 8;
                                                else if ((ip >> 24) < 192)
                                                else if ((ip >> 24) < 192)
-                                                       mask = 0xFFFF0000;
+                                                       bits = 16;
                                                else
                                                else
-                                                       mask = 0xFFFFFF00;
+                                                       bits = 24;
 
                                                if (routes == MAXROUTE)
                                                {
 
                                                if (routes == MAXROUTE)
                                                {
@@ -545,97 +707,66 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                }
                                                else if (ip)
                                                {
                                                }
                                                else if (ip)
                                                {
-                                                       LOG(3, s, session[s].tunnel, "   Radius reply contains route for %s/%s\n",
-                                                               fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1));
+                                                       LOG(3, s, session[s].tunnel, "   Radius reply contains route for %s/%d\n",
+                                                               fmtaddr(htonl(ip), 0), bits);
                                                        
                                                        session[s].route[routes].ip = ip;
                                                        
                                                        session[s].route[routes].ip = ip;
-                                                       session[s].route[routes].mask = mask;
+                                                       session[s].route[routes].prefixlen = bits;
                                                        routes++;
                                                }
                                        }
                                        else if (*p == 11)
                                        {
                                                // Filter-Id
                                                        routes++;
                                                }
                                        }
                                        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 if (*p == 26 && p[1] >= 7)
-                                       {
-                                               // Vendor-Specific Attribute
-                                               int vendor = ntohl(*(int *)(p + 2));
-                                               char attrib = *(p + 6);
-                                               int attrib_length = *(p + 7) - 2;
-                                               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)
+                                               }
+                                               else
                                                {
                                                {
-                                                       LOG(3, s, session[s].tunnel, "      Unknown vendor-specific\n");
-                                                       continue;
+                                                       *fp = f + 1;
+                                                       ip_filters[f].used++;
                                                }
                                                }
-
-                                               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 (*p == 27)
+                                       {
+                                               // Session-Timeout
+                                               if (p[1] < 6) continue;
+                                               session[s].session_timeout = ntohl(*(uint32_t *)(p + 2));
+                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Session-Timeout = %u\n", session[s].session_timeout);
+                                               if(!session[s].session_timeout && config->kill_timedout_sessions)
+                                                        sessionshutdown(s, "Session timeout is zero", CDN_ADMIN_DISC, 0);
+                                       }
+                                       else if (*p == 28)
+                                       {
+                                               // Idle-Timeout
+                                               if (p[1] < 6) continue;
+                                               session[s].idle_timeout = ntohl(*(uint32_t *)(p + 2));
+                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Idle-Timeout = %u\n", session[s].idle_timeout);
                                        }
                                        else if (*p == 99)
                                        {
                                        }
                                        else if (*p == 99)
                                        {
@@ -644,10 +775,10 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                                int prefixlen;
                                                uint8_t *n = p + 2;
                                                uint8_t *e = p + p[1];
                                                int prefixlen;
                                                uint8_t *n = p + 2;
                                                uint8_t *e = p + p[1];
-                                               uint8_t *m = strchr(n, '/');
+                                               uint8_t *m = memchr(n, '/', e - n);
 
                                                *m++ = 0;
 
                                                *m++ = 0;
-                                               inet_pton(AF_INET6, n, &r6);
+                                               inet_pton(AF_INET6, (char *) n, &r6);
 
                                                prefixlen = 0;
                                                while (m < e && isdigit(*m)) {
 
                                                prefixlen = 0;
                                                while (m < e && isdigit(*m)) {
@@ -656,12 +787,146 @@ void processrad(uint8_t *buf, int len, char socket_index)
 
                                                if (prefixlen)
                                                {
 
                                                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;
+                                                       if (routes6 == MAXROUTE6)
+                                                       {
+                                                               LOG(1, s, session[s].tunnel, "   Too many IPv6 routes\n");
+                                                       }
+                                                       else
+                                                       {
+                                                               LOG(3, s, session[s].tunnel, "   Radius reply contains route for %s/%d\n", n, prefixlen);
+                                                               session[s].route6[routes6].ipv6route = r6;
+                                                               session[s].route6[routes6].ipv6prefixlen = prefixlen;
+                                                               routes6++;
+                                                       }
+                                               }
+                                       }
+                                       else if (*p == 123)
+                                       {
+                                               // Delegated-IPv6-Prefix
+                                               if ((p[1] > 4) && (p[3] > 0) && (p[3] <= 128))
+                                               {
+                                                       char ipv6addr[INET6_ADDRSTRLEN];
+
+                                                       if (routes6 == MAXROUTE6)
+                                                       {
+                                                               LOG(1, s, session[s].tunnel, "   Too many IPv6 routes\n");
+                                                       }
+                                                       else
+                                                       {
+                                                               memcpy(&session[s].route6[routes6].ipv6route, &p[4], p[1] - 4);
+                                                               session[s].route6[routes6].ipv6prefixlen = p[3];
+                                                               LOG(3, s, session[s].tunnel, "   Radius reply contains Delegated IPv6 Prefix %s/%d\n",
+                                                                       inet_ntop(AF_INET6, &session[s].route6[routes6].ipv6route, ipv6addr, INET6_ADDRSTRLEN), session[s].route6[routes6].ipv6prefixlen);
+                                                               routes6++;
+                                                       }
+                                               }
+                                       }
+                                       else if (*p == 168)
+                                       {
+                                               // Framed-IPv6-Address
+                                               if (p[1] == 18)
+                                               {
+                                                       char ipv6addr[INET6_ADDRSTRLEN];
+                                                       memcpy(&session[s].ipv6address, &p[2], 16);
+                                                       LOG(3, s, session[s].tunnel, "   Radius reply contains Framed-IPv6-Address %s\n", inet_ntop(AF_INET6, &session[s].ipv6address, ipv6addr, INET6_ADDRSTRLEN));
+                                               }
+                                       }
+                                       else if (*p == 25)
+                                       {
+                                               // Class
+                                               if (p[1] < 3) continue;
+                                               session[s].classlen = p[1] - 2;
+                                               if (session[s].classlen > MAXCLASS)
+                                                       session[s].classlen = MAXCLASS;
+                                               memcpy(session[s].class, p + 2, session[s].classlen);
+                                       }
+                                       else if (*p == 64)
+                                       {
+                                               // Tunnel-Type
+                                               if (p[1] != 6) continue;
+                                               tag = p[2];
+                                               LOG(3, s, session[s].tunnel, "   Radius reply Tunnel-Type:%d %d\n",
+                                                       tag, ntohl(*(uint32_t *)(p + 2)) & 0xFFFFFF);
+                                               // Fill context
+                                               lac_set_rad_tag_tunnel_type(tag, ntohl(*(uint32_t *)(p + 2)) & 0xFFFFFF);
+                                               /* Request open tunnel to remote LNS*/
+                                               OpentunnelReq = 1;
+                                       }
+                                       else if (*p == 65)
+                                       {
+                                               // Tunnel-Medium-Type
+                                               if (p[1] < 6) continue;
+                                               tag = p[2];
+                                               LOG(3, s, session[s].tunnel, "   Radius reply Tunnel-Medium-Type:%d %d\n",
+                                                       tag, ntohl(*(uint32_t *)(p + 2)) & 0xFFFFFF);
+                                               // Fill context
+                                               lac_set_rad_tag_tunnel_medium_type(tag, ntohl(*(uint32_t *)(p + 2)) & 0xFFFFFF);
+                                       }
+                                       else if (*p == 67)
+                                       {
+                                               // Tunnel-Server-Endpoint
+                                               if (p[1] < 3) continue;
+                                               tag = p[2];
+                                               //If the Tag field is greater than 0x1F,
+                                               // it SHOULD be interpreted as the first byte of the following String field.
+                                               memset(strtemp, 0, 256);
+                                               if (tag > 0x1F)
+                                               {
+                                                       tag = 0;
+                                                       memcpy(strtemp, (p + 2), p[1]-2);
+                                               }
+                                               else
+                                                       memcpy(strtemp, (p + 3), p[1]-3);
+
+                                               LOG(3, s, session[s].tunnel, "   Radius reply Tunnel-Server-Endpoint:%d %s\n", tag, strtemp);
+                                               // Fill context
+                                               lac_set_rad_tag_tunnel_serv_endpt(tag, (char *) strtemp);
+                                       }
+                                       else if (*p == 69)
+                                       {
+                                               // Tunnel-Password
+                                               size_t lentemp;
+
+                                               if (p[1] < 5) continue;
+                                               tag = p[2];
+
+                                               memset(strtemp, 0, 256);
+                                               lentemp = p[1]-3;
+                                               memcpy(strtemp, (p + 3), lentemp);
+                                               if (!rad_tunnel_pwdecode(strtemp, &lentemp, config->radiussecret, radius[r].auth))
+                                               {
+                                                       LOG_HEX(3, "Error Decode Tunnel-Password, Dump Radius reponse:", p, p[1]);
+                                                       continue;
+                                               }
+
+                                               LOG(3, s, session[s].tunnel, "   Radius reply Tunnel-Password:%d %s\n", tag, strtemp);
+                                               if (strlen((char *) strtemp) > 63)
+                                               {
+                                                       LOG(1, s, session[s].tunnel, "tunnel password is too long (>63)\n");
+                                                       continue;
                                                }
                                                }
+                                               // Fill context
+                                               lac_set_rad_tag_tunnel_password(tag, (char *) strtemp);
+                                       }
+                                       else if (*p == 82)
+                                       {
+                                               // Tunnel-Assignment-Id
+                                               if (p[1] < 3) continue;
+                                               tag = p[2];
+                                               //If the Tag field is greater than 0x1F,
+                                               // it SHOULD be interpreted as the first byte of the following String field.
+                                               memset(strtemp, 0, 256);
+                                               if (tag > 0x1F)
+                                               {
+                                                       tag = 0;
+                                                       memcpy(strtemp, (p + 2), p[1]-2);
+                                               }
+                                               else
+                                                       memcpy(strtemp, (p + 3), p[1]-3);
+
+                                               LOG(3, s, session[s].tunnel, "   Radius reply Tunnel-Assignment-Id:%d %s\n", tag, strtemp);
+                                               // Fill context
+                                               lac_set_rad_tag_tunnel_assignment_id(tag, (char *) strtemp);
                                        }
                                }
                        }
                                        }
                                }
                        }
@@ -672,20 +937,77 @@ void processrad(uint8_t *buf, int len, char socket_index)
                                break;
                        }
 
                                break;
                        }
 
+                       if ((!config->disable_lac_func) && OpentunnelReq)
+                       {
+                               char assignment_id[256];
+                               // Save radius tag context to conf
+                               lac_save_rad_tag_tunnels(s);
+
+                               memset(assignment_id, 0, 256);
+                               if (!lac_rad_select_assignment_id(s, assignment_id))
+                                       break; // Error no assignment_id
+
+                               LOG(3, s, session[s].tunnel, "Select Tunnel Remote LNS for assignment_id == %s\n", assignment_id);
+
+                               if (lac_rad_forwardtoremotelns(s, assignment_id, session[s].user))
+                               {
+                                       int ro;
+                                       // Sanity check, no local IP to session forwarded
+                                       session[s].ip = 0;
+                                       for (ro = 0; r < MAXROUTE && session[s].route[ro].ip; r++)
+                                       {
+                                               session[s].route[ro].ip = 0;
+                                       }
+                                       break;
+                               }
+                       }
+
+                       // process auth response
+                       if (radius[r].chap)
+                       {
+                               // CHAP
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP, 0, 0, 0);
+                               if (!p) return; // Abort!
+
+                               *p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
+                               p[1] = radius[r].id;
+                               *(uint16_t *) (p + 2) = ntohs(4); // no message
+                               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
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP, 0, 0, 0);
+                               if (!p) return;         // Abort!
+
+                               // ack/nak
+                               *p = r_code;
+                               p[1] = radius[r].id;
+                               *(uint16_t *) (p + 2) = ntohs(5);
+                               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 (!session[s].dns1 && config->default_dns1)
                        {
                        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
                {
@@ -709,26 +1031,17 @@ 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)
        {
                case RADIUSCHAP:        // sending CHAP down PPP
        switch (radius[r].state)
        {
                case RADIUSCHAP:        // sending CHAP down PPP
-                       sendchap(t, s);
-                       break;
-               case RADIUSIPCP:
-                       sendipcp(t, s); // send IPCP
+                       sendchap(s, t);
                        break;
                case RADIUSAUTH:        // sending auth to RADIUS server
                        break;
                case RADIUSAUTH:        // sending auth to RADIUS server
-                       radiussend(r, RADIUSAUTH);
-                       break;
+               case RADIUSJUSTAUTH:    // sending auth to RADIUS server
                case RADIUSSTART:       // sending start accounting to RADIUS server
                case RADIUSSTART:       // sending start accounting to RADIUS server
-                       radiussend(r, RADIUSSTART);
-                       break;
                case RADIUSSTOP:        // sending stop accounting to RADIUS server
                case RADIUSSTOP:        // sending stop accounting to RADIUS server
-                       radiussend(r, RADIUSSTOP);
-                       break;
                case RADIUSINTERIM:     // sending interim accounting to RADIUS server
                case RADIUSINTERIM:     // sending interim accounting to RADIUS server
-                       radiussend(r, RADIUSINTERIM);
+                       radiussend(r, radius[r].state);
                        break;
                default:
                case RADIUSNULL:        // Not in use
                        break;
                default:
                case RADIUSNULL:        // Not in use
@@ -739,3 +1052,378 @@ void radiusretry(uint16_t r)
                        break;
        }
 }
                        break;
        }
 }
+
+extern int daefd;
+
+void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local)
+{
+       int i, r_code, r_id, length, attribute_length;
+       uint8_t *packet, attribute;
+       hasht hash;
+       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
+       calc_auth(buf, len, zero, hash);
+       if (memcmp(hash, buf + 4, 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", CDN_ADMIN_DISC, TERM_ADMIN_RESET); // 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;
+       // skip len + auth
+       packet += 2 + 16;
+       len = packet - buf;
+
+       // 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
+       calc_auth(buf, len, hash, buf + 4);
+
+       LOG(3, 0, 0, "Sending DAE %s, id=%d\n", radius_code(r_code), r_id);
+
+       // send DAE response
+       if (sendtofrom(daefd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL, (struct sockaddr *) addr, alen, local) < 0)
+               LOG(0, 0, 0, "Error sending DAE response packet: %s\n", strerror(errno));
+}
+
+// Decrypte the encrypted Tunnel Password.
+// Defined in RFC-2868.
+// the pl2tpsecret buffer must set to 256 characters.
+// return 0 on decoding error else length of decoded l2tpsecret
+int rad_tunnel_pwdecode(uint8_t *pl2tpsecret, size_t *pl2tpsecretlen,
+                                               const char *radiussecret, const uint8_t * auth)
+{
+       MD5_CTX ctx, oldctx;
+       hasht hash;
+       int secretlen;
+       unsigned i, n, len, decodedlen;
+
+/* 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 6 7
+* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  |     Salt      |     Salt      |   String ..........
+  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
+
+       len = *pl2tpsecretlen;
+
+       if (len < 2)
+       {
+               LOG(1, 0, 0, "tunnel password is too short, We need at least a salt\n");
+               return 0;
+       }
+
+       if (len <= 3)
+       {
+               pl2tpsecret[0] = 0;
+               *pl2tpsecretlen = 0;
+               LOG(1, 0, 0, "tunnel passwd is empty !!!\n");
+               return 0;
+       }
+
+       len -= 2;       /* discount the salt */
+
+       //Use the secret to setup the decryption
+       secretlen = strlen(radiussecret);
+
+       MD5_Init(&ctx);
+       MD5_Update(&ctx, (void *) radiussecret, secretlen);
+       oldctx = ctx;   /* save intermediate work */
+
+       // Set up the initial key:
+       //      b(1) = MD5(radiussecret + auth + salt)
+       MD5_Update(&ctx, (void *) auth, 16);
+       MD5_Update(&ctx, pl2tpsecret, 2);
+
+       decodedlen = 0;
+       for (n = 0; n < len; n += 16)
+       {
+               int base = 0;
+
+               if (n == 0)
+               {
+                       MD5_Final(hash, &ctx);
+
+                       ctx = oldctx;
+
+                        // the first octet, it's the 'data_len'
+                        // Check is correct
+                       decodedlen = pl2tpsecret[2] ^ hash[0];
+                       if (decodedlen >= len)
+                       {
+                               LOG(1, 0, 0, "tunnel password is too long !!!\n");
+                               return 0;
+                       }
+
+                       MD5_Update(&ctx, pl2tpsecret + 2, 16);
+                       base = 1;
+               } else
+               {
+                       MD5_Final(hash, &ctx);
+
+                       ctx = oldctx;
+                       MD5_Update(&ctx, pl2tpsecret + n + 2, 16);
+               }
+
+               for (i = base; i < 16; i++)
+               {
+                       pl2tpsecret[n + i - 1] = pl2tpsecret[n + i + 2] ^ hash[i];
+               }
+       }
+
+       if (decodedlen > 239) decodedlen = 239;
+
+       *pl2tpsecretlen = decodedlen;
+       pl2tpsecret[decodedlen] = 0;
+
+       return decodedlen;
+};