*** empty log message ***

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index f7a7b5b..fb380b9 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 

-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.10 2004/07/02 07:31:23 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.46 2004/11/09 05:42:53 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -22,8 +22,8 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.10 2004/07/02 07:31:23 bodea Exp
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>

-#define __USE_GNU

 #include <string.h>
 #include <string.h>

+#include <ctype.h>

 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>


@@ -51,7 +51,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.10 2004/07/02 07:31:23 bodea Exp
 
 // Globals
 struct configt *config = NULL; // all configuration
 
 // Globals
 struct configt *config = NULL; // all configuration

-int tapfd = -1;                        // tap interface file handle
+int tunfd = -1;                        // tun interface file handle. (network device)

 int udpfd = -1;                        // UDP file handle
 int controlfd = -1;            // Control signal handle
 int snoopfd = -1;              // UDP file handle for sending out intercept data
 int udpfd = -1;                        // UDP file handle
 int controlfd = -1;            // Control signal handle
 int snoopfd = -1;              // UDP file handle for sending out intercept data


@@ -59,24 +59,25 @@ int *radfds = NULL;         // RADIUS requests file handles
 int ifrfd = -1;                        // File descriptor for routing, etc
 time_t basetime = 0;           // base clock
 char hostname[1000] = "";      // us.
 int ifrfd = -1;                        // File descriptor for routing, etc
 time_t basetime = 0;           // base clock
 char hostname[1000] = "";      // us.

-u16 tapmac[3];                 // MAC of tap interface
-int tapidx;                    // ifr_ifindex of tap device
+int tunidx;                    // ifr_ifindex of tun device

 u32 sessionid = 0;             // session id for radius accounting
 int syslog_log = 0;            // are we logging to syslog
 u32 sessionid = 0;             // session id for radius accounting
 int syslog_log = 0;            // are we logging to syslog

-FILE *log_stream = NULL;
-struct sockaddr_in snoop_addr = {0};
-extern int cluster_sockfd;
-u32 last_sid = 0;
-int clifd = 0;
-sessionidt *cli_session_kill = NULL;
-tunnelidt *cli_tunnel_kill = NULL;
-static void *ip_hash[256];
-u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;
+FILE *log_stream = NULL;       // file handle for direct logging (i.e. direct into file, not via syslog).
+extern int cluster_sockfd;     // Intra-cluster communications socket.
+u32 last_id = 0;               // Last used PPP SID. Can I kill this?? -- mo
+int clifd = 0;                 // Socket listening for CLI connections.
+
+struct cli_session_actions *cli_session_actions = NULL;        // Pending session changes requested by CLI
+struct cli_tunnel_actions *cli_tunnel_actions = NULL;  // Pending tunnel changes required by CLI
+
+static void *ip_hash[256];     // Mapping from IP address to session structures.
+
+u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;    // Global traffic counters.

 u32 eth_tx = 0, eth_rx = 0, eth_rx_pkt = 0;
 u32 eth_tx = 0, eth_rx = 0, eth_rx_pkt = 0;

-u32 ip_pool_size = 1;
-time_t time_now = 0;
-char time_now_string[64] = {0};
-char main_quit = 0;
+u32 ip_pool_size = 1;          // Size of the pool of addresses used for dynamic address allocation.
+time_t time_now = 0;           // Current time in seconds since epoch.
+char time_now_string[64] = {0};        // Current time as a string.
+char main_quit = 0;            // True if we're in the process of exiting.

 char *_program_name = NULL;
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 char *_program_name = NULL;
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];


@@ -94,23 +95,29 @@ int bgp_configured = 0;
 struct config_descriptt config_values[] = {
        CONFIG("debug", debug, INT),
        CONFIG("log_file", log_filename, STRING),
 struct config_descriptt config_values[] = {
        CONFIG("debug", debug, INT),
        CONFIG("log_file", log_filename, STRING),

+       CONFIG("pid_file", pid_file, STRING),

        CONFIG("l2tp_secret", l2tpsecret, STRING),
        CONFIG("primary_dns", default_dns1, IP),
        CONFIG("secondary_dns", default_dns2, IP),
        CONFIG("save_state", save_state, BOOL),
        CONFIG("primary_radius", radiusserver[0], IP),
        CONFIG("secondary_radius", radiusserver[1], IP),
        CONFIG("l2tp_secret", l2tpsecret, STRING),
        CONFIG("primary_dns", default_dns1, IP),
        CONFIG("secondary_dns", default_dns2, IP),
        CONFIG("save_state", save_state, BOOL),
        CONFIG("primary_radius", radiusserver[0], IP),
        CONFIG("secondary_radius", radiusserver[1], IP),

+       CONFIG("primary_radius_port", radiusport[0], SHORT),
+       CONFIG("secondary_radius_port", radiusport[1], SHORT),

        CONFIG("radius_accounting", radius_accounting, BOOL),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("bind_address", bind_address, IP),
        CONFIG("radius_accounting", radius_accounting, BOOL),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("bind_address", bind_address, IP),

+       CONFIG("peer_address", peer_address, IP),

        CONFIG("send_garp", send_garp, BOOL),
        CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
        CONFIG("send_garp", send_garp, BOOL),
        CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),

+       CONFIG("throttle_buckets", num_tbfs, INT),

        CONFIG("accounting_dir", accounting_dir, STRING),
        CONFIG("setuid", target_uid, INT),
        CONFIG("dump_speed", dump_speed, BOOL),
        CONFIG("cleanup_interval", cleanup_interval, INT),
        CONFIG("multi_read_count", multi_read_count, INT),
        CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
        CONFIG("accounting_dir", accounting_dir, STRING),
        CONFIG("setuid", target_uid, INT),
        CONFIG("dump_speed", dump_speed, BOOL),
        CONFIG("cleanup_interval", cleanup_interval, INT),
        CONFIG("multi_read_count", multi_read_count, INT),
        CONFIG("scheduler_fifo", scheduler_fifo, BOOL),

+       CONFIG("lock_pages", lock_pages, BOOL),

        CONFIG("icmp_rate", icmp_rate, INT),
        CONFIG("cluster_address", cluster_address, IP),
        CONFIG("cluster_interface", cluster_interface, STRING),
        CONFIG("icmp_rate", icmp_rate, INT),
        CONFIG("cluster_address", cluster_address, IP),
        CONFIG("cluster_interface", cluster_interface, STRING),


@@ -143,11 +150,11 @@ char *plugin_functions[] = {
 
 #define max_plugin_functions (sizeof(plugin_functions) / sizeof(char *))
 
 
 #define max_plugin_functions (sizeof(plugin_functions) / sizeof(char *))
 

-tunnelt *tunnel = NULL;                // 1000 * 45 = 45000 = 45k
-sessiont *session = NULL;      // 5000 * 213 = 1065000 = 1 Mb
-sessioncountt *sess_count = NULL;
-radiust *radius = NULL;
-ippoolt *ip_address_pool = NULL;
+tunnelt *tunnel = NULL;                        // Array of tunnel structures.
+sessiont *session = NULL;              // Array of session structures.
+sessioncountt *sess_count = NULL;      // Array of partial per-session traffic counters.
+radiust *radius = NULL;                        // Array of radius structures.
+ippoolt *ip_address_pool = NULL;       // Array of dynamic IP addresses.

 controlt *controlfree = 0;
 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER
 controlt *controlfree = 0;
 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER


@@ -165,11 +172,12 @@ void dump_state();
 void tunnel_clean();
 tunnelidt new_tunnel();
 void update_config();
 void tunnel_clean();
 tunnelidt new_tunnel();
 void update_config();

+int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length);

 
 static void cache_ipmap(ipt ip, int s);
 static void uncache_ipmap(ipt ip);
 
 
 static void cache_ipmap(ipt ip, int s);
 static void uncache_ipmap(ipt ip);
 

-// return internal time (10ths since run)
+// return internal time (10ths since process startup)

 clockt now(void)
 {
        struct timeval t;
 clockt now(void)
 {
        struct timeval t;


@@ -178,12 +186,18 @@ clockt now(void)
 }
 
 // work out a retry time based on try number
 }
 
 // work out a retry time based on try number

+// This is a straight bounded exponential backoff.
+// Maximum re-try time is 32 seconds. (2^5).

 clockt backoff(u8 try)
 {
        if (try > 5) try = 5;                  // max backoff
        return now() + 10 * (1 << try);
 }
 
 clockt backoff(u8 try)
 {
        if (try > 5) try = 5;                  // max backoff
        return now() + 10 * (1 << try);
 }
 

+
+//
+// Log a debug message.  Typically called vias LOG macro
+//

 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {
        static char message[65536] = {0};
 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {
        static char message[65536] = {0};


@@ -227,17 +241,17 @@ void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format,
        va_end(ap);
 }
 
        va_end(ap);
 }
 

-void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *title, const char *data, int maxsize)
+void _log_hex(int level, const char *title, const char *data, int maxsize)

 {
        int i, j;
        const u8 *d = (const u8 *)data;
 
        if (config->debug < level) return;
 
 {
        int i, j;
        const u8 *d = (const u8 *)data;
 
        if (config->debug < level) return;
 

-       // No support for log_hex to syslog
+       // No support for _log_hex to syslog

        if (log_stream)
        {
        if (log_stream)
        {

-               log(level, address, s, t, "%s (%d bytes):\n", title, maxsize);
+               _log(level, 0, 0, 0, "%s (%d bytes):\n", title, maxsize);

                setvbuf(log_stream, NULL, _IOFBF, 16384);
 
                for (i = 0; i < maxsize; )
                setvbuf(log_stream, NULL, _IOFBF, 16384);
 
                for (i = 0; i < maxsize; )


@@ -297,7 +311,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
        ip &= mask;             // Force the ip to be the first one in the route.
 
        memset(&r, 0, sizeof(r));
        ip &= mask;             // Force the ip to be the first one in the route.
 
        memset(&r, 0, sizeof(r));

-       r.rt_dev = config->tapdevice;
+       r.rt_dev = config->tundevice;

        r.rt_dst.sa_family = AF_INET;
        *(u32 *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
        r.rt_gateway.sa_family = AF_INET;
        r.rt_dst.sa_family = AF_INET;
        *(u32 *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
        r.rt_gateway.sa_family = AF_INET;


@@ -310,14 +324,14 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
        else if (mask == 0xffffffff)
                r.rt_flags |= RTF_HOST;
 
        else if (mask == 0xffffffff)
                r.rt_flags |= RTF_HOST;
 

-       log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
+       LOG(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",

            add ? "add" : "del",
            ip   >> 24, ip   >> 16 & 0xff, ip   >> 8 & 0xff, ip   & 0xff,
            mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
            gw   >> 24, gw   >> 16 & 0xff, gw   >> 8 & 0xff, gw   & 0xff);
 
        if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
            add ? "add" : "del",
            ip   >> 24, ip   >> 16 & 0xff, ip   >> 8 & 0xff, ip   & 0xff,
            mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
            gw   >> 24, gw   >> 16 & 0xff, gw   >> 8 & 0xff, gw   & 0xff);
 
        if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)

-               log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));

 
 #ifdef BGP
        if (add)
 
 #ifdef BGP
        if (add)


@@ -344,31 +358,32 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
        }
 }
 
        }
 }
 

-// Set up TAP interface
-void inittap(void)
+//
+// Set up TUN interface
+void inittun(void)

 {
        struct ifreq ifr;
        struct sockaddr_in sin = {0};
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_flags = IFF_TUN;
 
 {
        struct ifreq ifr;
        struct sockaddr_in sin = {0};
        memset(&ifr, 0, sizeof(ifr));
        ifr.ifr_flags = IFF_TUN;
 

-       tapfd = open(TAPDEVICE, O_RDWR);
-       if (tapfd < 0)
+       tunfd = open(TUNDEVICE, O_RDWR);
+       if (tunfd < 0)

        {                          // fatal
        {                          // fatal

-               log(0, 0, 0, 0, "Can't open %s: %s\n", TAPDEVICE, strerror(errno));
+               LOG(0, 0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));

                exit(1);
        }
        {
                exit(1);
        }
        {

-               int flags = fcntl(tapfd, F_GETFL, 0);
-               fcntl(tapfd, F_SETFL, flags | O_NONBLOCK);
+               int flags = fcntl(tunfd, F_GETFL, 0);
+               fcntl(tunfd, F_SETFL, flags | O_NONBLOCK);

        }
        }

-       if (ioctl(tapfd, TUNSETIFF, (void *) &ifr) < 0)
+       if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)

        {
        {

-               log(0, 0, 0, 0, "Can't set tap interface: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       assert(strlen(ifr.ifr_name) < sizeof(config->tapdevice));
-       strncpy(config->tapdevice, ifr.ifr_name, sizeof(config->tapdevice) - 1);
+       assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
+       strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice) - 1);

        ifrfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
 
        sin.sin_family = AF_INET;
        ifrfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
 
        sin.sin_family = AF_INET;


@@ -377,34 +392,28 @@ void inittap(void)
 
        if (ioctl(ifrfd, SIOCSIFADDR, (void *) &ifr) < 0)
        {
 
        if (ioctl(ifrfd, SIOCSIFADDR, (void *) &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error setting tun address: %s\n", strerror(errno));

                exit(1);
        }
        /* Bump up the qlen to deal with bursts from the network */
        ifr.ifr_qlen = 1000;
        if (ioctl(ifrfd, SIOCSIFTXQLEN, (void *) &ifr) < 0)
        {
                exit(1);
        }
        /* Bump up the qlen to deal with bursts from the network */
        ifr.ifr_qlen = 1000;
        if (ioctl(ifrfd, SIOCSIFTXQLEN, (void *) &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));

                exit(1);
        }
        ifr.ifr_flags = IFF_UP;
        if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
        {
                exit(1);
        }
        ifr.ifr_flags = IFF_UP;
        if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       if (ioctl(ifrfd, SIOCGIFHWADDR, (void *) &ifr) < 0)
-       {
-               log(0, 0, 0, 0, "Error setting tun hardware address: %s\n", strerror(errno));
-               exit(1);
-       }
-       memcpy(&tapmac, 2 + (u8 *) & ifr.ifr_hwaddr, 6);

        if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
        {
        if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       tapidx = ifr.ifr_ifindex;
+       tunidx = ifr.ifr_ifindex;

 }
 
 // set up UDP port
 }
 
 // set up UDP port


@@ -418,7 +427,7 @@ void initudp(void)
        addr.sin_family = AF_INET;
        addr.sin_port = htons(L2TPPORT);
        addr.sin_addr.s_addr = config->bind_address;
        addr.sin_family = AF_INET;
        addr.sin_port = htons(L2TPPORT);
        addr.sin_addr.s_addr = config->bind_address;

-       udpfd = socket(AF_INET, SOCK_DGRAM, UDP);
+       udpfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

        setsockopt(udpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        {
                int flags = fcntl(udpfd, F_GETFL, 0);
        setsockopt(udpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        {
                int flags = fcntl(udpfd, F_GETFL, 0);


@@ -426,11 +435,10 @@ void initudp(void)
        }
        if (bind(udpfd, (void *) &addr, sizeof(addr)) < 0)
        {
        }
        if (bind(udpfd, (void *) &addr, sizeof(addr)) < 0)
        {

-               log(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       snoopfd = socket(AF_INET, SOCK_DGRAM, UDP);
-       snoop_addr.sin_family = AF_INET;
+       snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

 
        // Control
        memset(&addr, 0, sizeof(addr));
 
        // Control
        memset(&addr, 0, sizeof(addr));


@@ -440,7 +448,7 @@ void initudp(void)
        setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        if (bind(controlfd, (void *) &addr, sizeof(addr)) < 0)
        {
        setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        if (bind(controlfd, (void *) &addr, sizeof(addr)) < 0)
        {

-               log(0, 0, 0, 0, "Error in control bind: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error in control bind: %s\n", strerror(errno));

                exit(1);
        }
 }
                exit(1);
        }
 }


@@ -511,9 +519,9 @@ static void cache_ipmap(ipt ip, int s)
        d[(size_t) a[3]] = (char *)((int)s);
 
        if (s > 0)
        d[(size_t) a[3]] = (char *)((int)s);
 
        if (s > 0)

-               log(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
+               LOG(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));

        else if (s == 0)
        else if (s == 0)

-               log(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
+               LOG(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));

        // else a map to an ip pool index.
 }
 
        // else a map to an ip pool index.
 }
 


@@ -534,20 +542,28 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
        if (CLI_HELP_REQUESTED)
                return CLI_HELP_NO_ARGS;
 
        if (CLI_HELP_REQUESTED)
                return CLI_HELP_NO_ARGS;
 

-        cli_print(cli, "%7s %s", "Sess#", "IP Address");
+       cli_print(cli, "%7s %s", "Sess#", "IP Address");

 
 

-       for (i = 0; i < 256; ++i) {
-               if (!d[i]) continue;
+       for (i = 0; i < 256; ++i)
+       {
+               if (!d[i])
+                       continue;

                e = (char**) d[i];
                e = (char**) d[i];

-               for (j = 0; j < 256; ++j) {
-                       if (!e[j]) continue;
+               for (j = 0; j < 256; ++j)
+               {
+                       if (!e[j])
+                               continue;

                        f = (char**) e[j];
                        f = (char**) e[j];

-                       for (k = 0; k < 256; ++k) {
-                               if (!f[k]) continue;
+                       for (k = 0; k < 256; ++k)
+                       {
+                               if (!f[k])
+                                       continue;

                                g = (char**)f[k];
                                g = (char**)f[k];

-                               for (l = 0; l < 256; ++l) {
-                                       if (!g[l]) continue;
-                                       cli_print(cli, "%7d %d.%d.%d.%d",  (int) g[l], i, j, k, l);
+                               for (l = 0; l < 256; ++l)
+                               {
+                                       if (!g[l])
+                                               continue;
+                                       cli_print(cli, "%7d %d.%d.%d.%d", (int) g[l], i, j, k, l);

                                        ++count;
                                }
                        }
                                        ++count;
                                }
                        }


@@ -569,7 +585,8 @@ sessionidt sessionbyuser(char *username)
        int s;
        CSTAT(call_sessionbyuser);
 
        int s;
        CSTAT(call_sessionbyuser);
 

-       for (s = 1; s < MAXSESSION ; ++s) {
+       for (s = 1; s < MAXSESSION ; ++s)
+       {

                if (session[s].walled_garden)
                        continue;               // Skip walled garden users.
 
                if (session[s].walled_garden)
                        continue;               // Skip walled garden users.
 


@@ -589,21 +606,21 @@ void send_garp(ipt ip)
        s = socket(PF_INET, SOCK_DGRAM, 0);
        if (s < 0)
        {
        s = socket(PF_INET, SOCK_DGRAM, 0);
        if (s < 0)
        {

-               log(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));

                return;
        }
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
        if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
        {
                return;
        }
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
        if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));

                close(s);
                return;
        }
        memcpy(mac, &ifr.ifr_hwaddr.sa_data, 6*sizeof(char));
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
        {
                close(s);
                return;
        }
        memcpy(mac, &ifr.ifr_hwaddr.sa_data, 6*sizeof(char));
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
        {

-               log(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));

                close(s);
                return;
        }
                close(s);
                return;
        }


@@ -625,82 +642,6 @@ sessionidt sessionidtbysessiont(sessiont *s)
        return val;
 }
 
        return val;
 }
 

-// Handle ARP requests
-void processarp(u8 * buf, int len)
-{
-       ipt ip;
-       sessionidt s;
-
-       CSTAT(call_processarp);
-       STAT(arp_recv);
-
-       if (len != 46)
-       {
-               log(0, 0, 0, 0, "Unexpected length ARP %d bytes\n", len);
-               STAT(arp_errors);
-               return;
-       }
-       if (*(u16 *) (buf + 16) != htons(PKTARP))
-       {
-               log(0, 0, 0, 0, "Unexpected ARP type %04X\n", ntohs(*(u16 *) (buf + 16)));
-               STAT(arp_errors);
-               return;
-       }
-       if (*(u16 *) (buf + 18) != htons(0x0001))
-       {
-               log(0, 0, 0, 0, "Unexpected ARP hard type %04X\n", ntohs(*(u16 *) (buf + 18)));
-               STAT(arp_errors);
-               return;
-       }
-       if (*(u16 *) (buf + 20) != htons(PKTIP))
-       {
-               log(0, 0, 0, 0, "Unexpected ARP prot type %04X\n", ntohs(*(u16 *) (buf + 20)));
-               STAT(arp_errors);
-               return;
-       }
-       if (buf[22] != 6)
-       {
-               log(0, 0, 0, 0, "Unexpected ARP hard len %d\n", buf[22]);
-               STAT(arp_errors);
-               return;
-       }
-       if (buf[23] != 4)
-       {
-               log(0, 0, 0, 0, "Unexpected ARP prot len %d\n", buf[23]);
-               STAT(arp_errors);
-               return;
-       }
-       if (*(u16 *) (buf + 24) != htons(0x0001))
-       {
-               log(0, 0, 0, 0, "Unexpected ARP op %04X\n", ntohs(*(u16 *) (buf + 24)));
-               STAT(arp_errors);
-               return;
-       }
-       ip = *(u32 *) (buf + 42);
-       // look up session
-       s = sessionbyip(ip);
-       if (s)
-       {
-               log(3, ntohl(ip), s, session[s].tunnel, "ARP reply for %s\n", inet_toa(ip));
-               memcpy(buf + 4, buf + 10, 6); // set destination as source
-               *(u16 *) (buf + 10) = htons(tapmac[0]); // set source address
-               *(u16 *) (buf + 12) = htons(tapmac[1]);
-               *(u16 *) (buf + 14) = htons(tapmac[2]);
-               *(u16 *) (buf + 24) = htons(0x0002); // ARP reply
-               memcpy(buf + 26, buf + 10, 6); // sender ethernet
-               memcpy(buf + 36, buf + 4, 6); // target ethernet
-               *(u32 *) (buf + 42) = *(u32 *) (buf + 32); // target IP
-               *(u32 *) (buf + 32) = ip; // sender IP
-               write(tapfd, buf, len);
-               STAT(arp_replies);
-       }
-       else
-       {
-               log(3, ntohl(ip), 0, 0, "ARP request for unknown IP %s\n", inet_toa(ip));
-               STAT(arp_discarded);
-       }
-}
-

 // actually send a control message for a specific tunnel
 void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 {
 // actually send a control message for a specific tunnel
 void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 {


@@ -711,7 +652,7 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
        if (!t)
        {
                static int backtrace_count = 0;
        if (!t)
        {
                static int backtrace_count = 0;

-               log(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
+               LOG(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");

                STAT(tunnel_tx_errors);
                log_backtrace(backtrace_count, 5)
                return;
                STAT(tunnel_tx_errors);
                log_backtrace(backtrace_count, 5)
                return;


@@ -720,7 +661,7 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
        if (!tunnel[t].ip)
        {
                static int backtrace_count = 0;
        if (!tunnel[t].ip)
        {
                static int backtrace_count = 0;

-               log(1, 0, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
+               LOG(1, 0, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");

                log_backtrace(backtrace_count, 5)
                STAT(tunnel_tx_errors);
                return;
                log_backtrace(backtrace_count, 5)
                STAT(tunnel_tx_errors);
                return;


@@ -741,19 +682,19 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
                if (tunnel[t].try > 1)
                {
                        STAT(tunnel_retries);
                if (tunnel[t].try > 1)
                {
                        STAT(tunnel_retries);

-                       log(3, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);
+                       LOG(3, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);

                }
        }
 
        if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
        {
                }
        }
 
        if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
        {

-               log(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
+               LOG(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",

                                strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
                STAT(tunnel_tx_errors);
                return;
        }
 
                                strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
                STAT(tunnel_tx_errors);
                return;
        }
 

-       log_hex(5, "Send Tunnel Data", buf, l);
+       LOG_HEX(5, "Send Tunnel Data", buf, l);

        STAT(tunnel_tx_packets);
        INC_STAT(tunnel_tx_bytes, l);
 }
        STAT(tunnel_tx_packets);
        INC_STAT(tunnel_tx_bytes, l);
 }


@@ -764,7 +705,7 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 //
 int tun_write(u8 * data, int size)
 {
 //
 int tun_write(u8 * data, int size)
 {

-       return write(tapfd, data, size);
+       return write(tunfd, data, size);

 }
 
 // process outgoing (to tunnel) IP
 }
 
 // process outgoing (to tunnel) IP


@@ -785,13 +726,13 @@ void processipout(u8 * buf, int len)
 
        if (len < MIN_IP_SIZE)
        {
 
        if (len < MIN_IP_SIZE)
        {

-               log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
+               LOG(1, 0, 0, 0, "Short IP, %d bytes\n", len);

                STAT(tunnel_tx_errors);
                return;
        }
        if (len >= MAXETHER)
        {
                STAT(tunnel_tx_errors);
                return;
        }
        if (len >= MAXETHER)
        {

-               log(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
+               LOG(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);

                STAT(tunnel_tx_errors);
                return;
        }
                STAT(tunnel_tx_errors);
                return;
        }


@@ -803,7 +744,7 @@ void processipout(u8 * buf, int len)
        // Got an IP header now
        if (*(u8 *)(buf) >> 4 != 4)
        {
        // Got an IP header now
        if (*(u8 *)(buf) >> 4 != 4)
        {

-               log(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
+               LOG(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");

                return;
        }
 
                return;
        }
 


@@ -814,14 +755,15 @@ void processipout(u8 * buf, int len)
                static int rate = 0;    // Number of ICMP packets we've sent this second.
                static int last = 0;    // Last time we reset the ICMP packet counter 'rate'.
 
                static int rate = 0;    // Number of ICMP packets we've sent this second.
                static int last = 0;    // Last time we reset the ICMP packet counter 'rate'.
 

-               if (last != time_now) {
+               if (last != time_now)
+               {

                        last = time_now;
                        rate = 0;
                }
 
                if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
                {
                        last = time_now;
                        rate = 0;
                }
 
                if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
                {

-                       log(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));
+                       LOG(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));

                        host_unreachable(*(u32 *)(buf + 12), *(u16 *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
                }
                return;
                        host_unreachable(*(u32 *)(buf + 12), *(u16 *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
                }
                return;


@@ -845,22 +787,23 @@ void processipout(u8 * buf, int len)
                return;
        }
 
                return;
        }
 

-       // Snooping this session, send it to intercept box
-       if (sp->snoop_ip && sp->snoop_port)
-               snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
-
-       log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
+       LOG(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);

 
        // Add on L2TP header
        {
                u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
 
        // Add on L2TP header
        {
                u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);

-               if (!p) {
-                       log(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
+               if (!p)
+               {
+                       LOG(3, session[s].ip, s, t, "failed to send packet in processipout.\n");

                        return;
                }
                tunnelsend(b, len + (p-b), t); // send it...
        }
 
                        return;
                }
                tunnelsend(b, len + (p-b), t); // send it...
        }
 

+       // Snooping this session, send it to intercept box
+       if (sp->snoop_ip && sp->snoop_port)
+               snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+

        sp->cout += len; // byte count
        sp->total_cout += len; // byte count
        sp->pout++;
        sp->cout += len; // byte count
        sp->total_cout += len; // byte count
        sp->pout++;


@@ -880,8 +823,9 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
        u8 b[MAXETHER + 20];
 
 
        u8 b[MAXETHER + 20];
 

-       if (len < 0 || len > MAXETHER) {
-               log(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
+       if (len < 0 || len > MAXETHER)
+       {
+               LOG(1,0,0,0, "Odd size IP packet: %d bytes\n", len);

                return;
        }
 
                return;
        }
 


@@ -893,24 +837,27 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
        if (!session[s].ip)
                return;
 
        if (!session[s].ip)
                return;

+

        t = session[s].tunnel;
        sp = &session[s];
 
        t = session[s].tunnel;
        sp = &session[s];
 

-       log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
-
-       // Snooping this session, send it to intercept box
-       if (sp->snoop_ip && sp->snoop_port)
-               snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+       LOG(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);

 
        // Add on L2TP header
        {
                u8 *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
 
        // Add on L2TP header
        {
                u8 *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);

-               if (!p) {
-                       log(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
+               if (!p)
+               {
+                       LOG(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");

                        return;
                }
                tunnelsend(b, len + (p-b), t); // send it...
        }
                        return;
                }
                tunnelsend(b, len + (p-b), t); // send it...
        }

+
+       // Snooping this session.
+       if (sp->snoop_ip && sp->snoop_port)
+               snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+

        sp->cout += len; // byte count
        sp->total_cout += len; // byte count
        sp->pout++;
        sp->cout += len; // byte count
        sp->total_cout += len; // byte count
        sp->pout++;


@@ -1024,56 +971,48 @@ void controladd(controlt * c, tunnelidt t, sessionidt s)
 //
 // Throttle or Unthrottle a session
 //
 //
 // Throttle or Unthrottle a session
 //

-// Throttle the data folling through a session
-// to be no more than 'throttle' kbit/sec each way.
+// Throttle the data from/to through a session to no more than
+// 'rate_in' kbit/sec in (from user) or 'rate_out' kbit/sec out (to
+// user).
+//
+// If either value is -1, the current value is retained for that
+// direction.

 //
 //

-int throttle_session(sessionidt s, int throttle)
+void throttle_session(sessionidt s, int rate_in, int rate_out)

 {
        if (!session[s].tunnel)
 {
        if (!session[s].tunnel)

-               return 0;       // No-one home.
-
-        if (!*session[s].user)
-                return 0; // User not logged in
+               return; // No-one home.

 
 

-       if (throttle) {
-               if (session[s].tbf_in || session[s].tbf_out) {
-                       if (throttle == session[s].throttle)
-                               return 1;
-
-                       // Currently throttled but the rate is changing.
+       if (!*session[s].user)
+               return; // User not logged in

 
 

+       if (rate_in >= 0)
+       {
+               int bytes = rate_in * 1024 / 8; // kbits to bytes
+               if (session[s].tbf_in)

                        free_tbf(session[s].tbf_in);
                        free_tbf(session[s].tbf_in);

-                       free_tbf(session[s].tbf_out);
-               }
-
-               session[s].tbf_in = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipin);
-               session[s].tbf_out = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipout);

 
 

-               if (throttle != session[s].throttle) {  // Changed. Flood to slaves.
-                       session[s].throttle = throttle;
-                       cluster_send_session(s);
-               }
+               if (rate_in > 0)
+                       session[s].tbf_in = new_tbf(s, bytes * 2, bytes, send_ipin);
+               else
+                       session[s].tbf_in = 0;

 
 

-               return 1;
+               session[s].throttle_in = rate_in;

        }
 
        }
 

-       // else Unthrottling.
-
-       if (!session[s].tbf_in && !session[s].tbf_out && !session[s].throttle)
-               return 0;
-
-       free_tbf(session[s].tbf_in);
-       session[s].tbf_in = 0;
+       if (rate_out >= 0)
+       {
+               int bytes = rate_out * 1024 / 8;
+               if (session[s].tbf_out)
+                       free_tbf(session[s].tbf_out);

 
 

-       free_tbf(session[s].tbf_out);
-       session[s].tbf_out = 0;
+               if (rate_out > 0)
+                       session[s].tbf_out = new_tbf(s, bytes * 2, bytes, send_ipout);
+               else
+                       session[s].tbf_out = 0;

 
 

-       if (throttle != session[s].throttle) {  // Changed. Flood to slaves.
-               session[s].throttle = throttle;
-               cluster_send_session(s);
+               session[s].throttle_out = rate_out;

        }
        }

-
-       return 0;

 }
 
 // start tidy shutdown of session
 }
 
 // start tidy shutdown of session


@@ -1087,12 +1026,12 @@ void sessionshutdown(sessionidt s, char *reason)
 
        if (!session[s].tunnel)
        {
 
        if (!session[s].tunnel)
        {

-               log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
+               LOG(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");

                return;                   // not a live session
        }
 
                return;                   // not a live session
        }
 

-       if (!session[s].die)
-               log(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
+       if (!dead)
+               LOG(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);

 
        session[s].die = now() + 150; // Clean up in 15 seconds
 
 
        session[s].die = now() + 150; // Clean up in 15 seconds
 


@@ -1102,13 +1041,14 @@ void sessionshutdown(sessionidt s, char *reason)
        }
 
        // RADIUS Stop message
        }
 
        // RADIUS Stop message

-       if (session[s].opened && !walled_garden && !dead) {
+       if (session[s].opened && !walled_garden && !dead)
+       {

                u16 r = session[s].radius;
                if (!r)
                {
                        if (!(r = radiusnew(s)))
                        {
                u16 r = session[s].radius;
                if (!r)
                {
                        if (!(r = radiusnew(s)))
                        {

-                               log(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
+                               LOG(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");

                                STAT(radius_overflow);
                        }
                        else
                                STAT(radius_overflow);
                        }
                        else


@@ -1138,16 +1078,18 @@ void sessionshutdown(sessionidt s, char *reason)
                }
                else
                        free_ip_address(s);
                }
                else
                        free_ip_address(s);

-
-               if (session[s].throttle)        // Unthrottle if throttled.
-                       throttle_session(s, 0);

        }
        }

+
+       if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
+               throttle_session(s, 0, 0);
+

        {                            // Send CDN
                controlt *c = controlnew(14); // sending CDN
                control16(c, 1, 3, 1);    // result code (admin reasons - TBA make error, general error, add message
                control16(c, 14, s, 1);   // assigned session (our end)
                controladd(c, session[s].tunnel, s); // send the message
        }
        {                            // Send CDN
                controlt *c = controlnew(14); // sending CDN
                control16(c, 1, 3, 1);    // result code (admin reasons - TBA make error, general error, add message
                control16(c, 14, s, 1);   // assigned session (our end)
                controladd(c, session[s].tunnel, s); // send the message
        }

+

        cluster_send_session(s);
 }
 
        cluster_send_session(s);
 }
 


@@ -1161,21 +1103,25 @@ void sendipcp(tunnelidt t, sessionidt s)
 
        if (!r)
                r = radiusnew(s);
 
        if (!r)
                r = radiusnew(s);

+

        if (radius[r].state != RADIUSIPCP)
        {
                radius[r].state = RADIUSIPCP;
                radius[r].try = 0;
        }
        if (radius[r].state != RADIUSIPCP)
        {
                radius[r].state = RADIUSIPCP;
                radius[r].try = 0;
        }

+

        radius[r].retry = backoff(radius[r].try++);
        if (radius[r].try > 10)
        {
        radius[r].retry = backoff(radius[r].try++);
        if (radius[r].try > 10)
        {

+               radiusclear(r, s);      // Clear radius session.

                sessionshutdown(s, "No reply on IPCP");
                return;
        }
 
        q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
                sessionshutdown(s, "No reply on IPCP");
                return;
        }
 
        q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);

-       if (!q) {
-               log(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");
+       if (!q)
+       {
+               LOG(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");

                return;
        }
 
                return;
        }
 


@@ -1184,7 +1130,10 @@ void sendipcp(tunnelidt t, sessionidt s)
        *(u16 *) (q + 2) = htons(10);
        q[4] = 3;
        q[5] = 6;
        *(u16 *) (q + 2) = htons(10);
        q[4] = 3;
        q[5] = 6;

-       *(u32 *) (q + 6) = config->bind_address; // send my IP
+       *(u32 *) (q + 6) = config->peer_address ? config->peer_address :
+                          config->bind_address ? config->bind_address :
+                          my_address; // send my IP
+

        tunnelsend(buf, 10 + (q - buf), t); // send it
        session[s].flags &= ~SF_IPCP_ACKED;     // Clear flag.
 }
        tunnelsend(buf, 10 + (q - buf), t); // send it
        session[s].flags &= ~SF_IPCP_ACKED;     // Clear flag.
 }


@@ -1195,17 +1144,18 @@ void sessionkill(sessionidt s, char *reason)
 
        CSTAT(call_sessionkill);
 
 
        CSTAT(call_sessionkill);
 

+       session[s].die = now();

        sessionshutdown(s, reason);  // close radius/routes, etc.
        if (session[s].radius)
        sessionshutdown(s, reason);  // close radius/routes, etc.
        if (session[s].radius)

-               radiusclear(session[s].radius, 0); // cant send clean accounting data, session is killed
-       log(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
+               radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed

 
 

-       throttle_session(s, 0);         // Force session to be un-throttle. Free'ing TBF structures.
+       LOG(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);

 
        memset(&session[s], 0, sizeof(session[s]));
        session[s].tunnel = T_FREE;     // Mark it as free.
        session[s].next = sessionfree;
        sessionfree = s;
 
        memset(&session[s], 0, sizeof(session[s]));
        session[s].tunnel = T_FREE;     // Mark it as free.
        session[s].next = sessionfree;
        sessionfree = s;

+       cli_session_actions[s].action = 0;

        cluster_send_session(s);
 }
 
        cluster_send_session(s);
 }
 


@@ -1235,10 +1185,9 @@ void tunnelkill(tunnelidt t, char *reason)
 
        // free tunnel
        tunnelclear(t);
 
        // free tunnel
        tunnelclear(t);

+       LOG(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
+       cli_tunnel_actions[s].action = 0;

        cluster_send_tunnel(t);
        cluster_send_tunnel(t);

-       log(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
-       tunnel[t].die = 0;
-       tunnel[t].state = TUNNELFREE;

 }
 
 // shut down a tunnel cleanly
 }
 
 // shut down a tunnel cleanly


@@ -1254,7 +1203,7 @@ void tunnelshutdown(tunnelidt t, char *reason)
                tunnelkill(t, reason);
                return;
        }
                tunnelkill(t, reason);
                return;
        }

-       log(1, 0, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
+       LOG(1, 0, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);

 
        // close session
        for (s = 1; s < MAXSESSION; s++)
 
        // close session
        for (s = 1; s < MAXSESSION; s++)


@@ -1285,18 +1234,18 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 
        udp_rx += len;
        udp_rx_pkt++;
 
        udp_rx += len;
        udp_rx_pkt++;

-       log_hex(5, "UDP Data", buf, len);
+       LOG_HEX(5, "UDP Data", buf, len);

        STAT(tunnel_rx_packets);
        INC_STAT(tunnel_rx_bytes, len);
        if (len < 6)
        {
        STAT(tunnel_rx_packets);
        INC_STAT(tunnel_rx_bytes, len);
        if (len < 6)
        {

-               log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Short UDP, %d bytes\n", len);
+               LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Short UDP, %d bytes\n", len);

                STAT(tunnel_rx_errors);
                return;
        }
        if ((buf[1] & 0x0F) != 2)
        {
                STAT(tunnel_rx_errors);
                return;
        }
        if ((buf[1] & 0x0F) != 2)
        {

-               log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
+               LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);

                STAT(tunnel_rx_errors);
                return;
        }
                STAT(tunnel_rx_errors);
                return;
        }


@@ -1311,13 +1260,13 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
        p += 2;
        if (s >= MAXSESSION)
        {
        p += 2;
        if (s >= MAXSESSION)
        {

-               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
+               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");

                STAT(tunnel_rx_errors);
                return;
        }
        if (t >= MAXTUNNEL)
        {
                STAT(tunnel_rx_errors);
                return;
        }
        if (t >= MAXTUNNEL)
        {

-               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
+               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");

                STAT(tunnel_rx_errors);
                return;
        }
                STAT(tunnel_rx_errors);
                return;
        }


@@ -1335,7 +1284,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
        }
        if ((p - buf) > l)
        {
        }
        if ((p - buf) > l)
        {

-               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
+               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);

                STAT(tunnel_rx_errors);
                return;
        }
                STAT(tunnel_rx_errors);
                return;
        }


@@ -1354,18 +1303,19 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                char called[MAXTEL] = ""; // called number
                char calling[MAXTEL] = ""; // calling number
 
                char called[MAXTEL] = ""; // called number
                char calling[MAXTEL] = ""; // calling number
 

-               if (!config->cluster_iam_master) {
+               if (!config->cluster_iam_master)
+               {

                        master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
                        return;
                }
 
                if ((*buf & 0xCA) != 0xC8)
                {
                        master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
                        return;
                }
 
                if ((*buf & 0xCA) != 0xC8)
                {

-                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad control header %02X\n", *buf);
+                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad control header %02X\n", *buf);

                        STAT(tunnel_rx_errors);
                        return;
                }
                        STAT(tunnel_rx_errors);
                        return;
                }

-               log(3, ntohl(addr->sin_addr.s_addr), s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
+               LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",

                                l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
                // if no tunnel specified, assign one
                if (!t)
                                l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
                // if no tunnel specified, assign one
                if (!t)


@@ -1375,20 +1325,22 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                //
                                // Is this a duplicate of the first packet? (SCCRQ)
                                //
                                //
                                // Is this a duplicate of the first packet? (SCCRQ)
                                //

-                       for ( i = 1; i <= config->cluster_highest_tunnelid ; ++i) {
-                               if (tunnel[t].state != TUNNELOPENING ||
-                                       tunnel[t].ip != ntohl(*(ipt *) & addr->sin_addr) ||
-                                       tunnel[t].port != ntohs(addr->sin_port) )
+                       for (i = 1; i <= config->cluster_highest_tunnelid ; ++i)
+                       {
+                               if (tunnel[i].state != TUNNELOPENING ||
+                                       tunnel[i].ip != ntohl(*(ipt *) & addr->sin_addr) ||
+                                       tunnel[i].port != ntohs(addr->sin_port) )

                                        continue;
                                t = i;
                                break;
                        }
                }
 
                                        continue;
                                t = i;
                                break;
                        }
                }
 

-               if (!t) {
+               if (!t)
+               {

                        if (!(t = new_tunnel()))
                        {
                        if (!(t = new_tunnel()))
                        {

-                               log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
+                               LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");

                                STAT(tunnel_overflow);
                                return;
                        }
                                STAT(tunnel_overflow);
                                return;
                        }


@@ -1396,7 +1348,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                        tunnel[t].ip = ntohl(*(ipt *) & addr->sin_addr);
                        tunnel[t].port = ntohs(addr->sin_port);
                        tunnel[t].window = 4; // default window
                        tunnel[t].ip = ntohl(*(ipt *) & addr->sin_addr);
                        tunnel[t].port = ntohs(addr->sin_port);
                        tunnel[t].window = 4; // default window

-                       log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
+                       LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, "   New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);

                        STAT(tunnel_created);
                }
 
                        STAT(tunnel_created);
                }
 


@@ -1427,7 +1379,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                        if (ns != tunnel[t].nr)
                        {
                                // is this the sequence we were expecting?
                        if (ns != tunnel[t].nr)
                        {
                                // is this the sequence we were expecting?

-                               log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
+                               LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);

                                STAT(tunnel_rx_errors);
 
                                if (l)  // Is this not a ZLB?
                                STAT(tunnel_rx_errors);
 
                                if (l)  // Is this not a ZLB?


@@ -1470,7 +1422,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                p += n;       // next
                                if (l < n)
                                {
                                p += n;       // next
                                if (l < n)
                                {

-                                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
+                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");

                                        STAT(tunnel_rx_errors);
                                        fatal = flags;
                                        return;
                                        STAT(tunnel_rx_errors);
                                        fatal = flags;
                                        return;


@@ -1481,28 +1433,35 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        // handle hidden AVPs
                                        if (!*config->l2tpsecret)
                                        {
                                        // handle hidden AVPs
                                        if (!*config->l2tpsecret)
                                        {

-                                               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");
+                                               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");

                                                fatal = flags;
                                                continue;
                                        }
                                        if (!session[s].random_vector_length)
                                        {
                                                fatal = flags;
                                                continue;
                                        }
                                        if (!session[s].random_vector_length)
                                        {

-                                               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
+                                               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
+                                               fatal = flags;
+                                               continue;
+                                       }
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
+                                       // Unhide the AVP
+                                       n = unhide_avp(b, t, s, n);
+                                       if (n == 0)
+                                       {

                                                fatal = flags;
                                                continue;
                                        }
                                                fatal = flags;
                                                continue;
                                        }

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");

                                }
                                if (*b & 0x3C)
                                {
                                }
                                if (*b & 0x3C)
                                {

-                                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);
+                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);

                                        fatal = flags;
                                        continue; // next
                                }
                                b += 2;
                                if (*(u16 *) (b))
                                {
                                        fatal = flags;
                                        continue; // next
                                }
                                b += 2;
                                if (*(u16 *) (b))
                                {

-                                       log(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
+                                       LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));

                                        fatal = flags;
                                        continue; // next
                                }
                                        fatal = flags;
                                        continue; // next
                                }


@@ -1511,12 +1470,12 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                b += 2;
                                n -= 6;
 
                                b += 2;
                                n -= 6;
 

-                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
+                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);

                                switch (mtype)
                                {
                                case 0:     // message type
                                        message = ntohs(*(u16 *) b);
                                switch (mtype)
                                {
                                case 0:     // message type
                                        message = ntohs(*(u16 *) b);

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Message type = %d (%s)\n", *b,
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Message type = %d (%s)\n", *b,

                                                        l2tp_message_types[message]);
                                        mandatorymessage = flags;
                                        break;
                                                        l2tp_message_types[message]);
                                        mandatorymessage = flags;
                                        break;


@@ -1524,41 +1483,42 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        {
                                                u16 rescode = ntohs(*(u16 *)(b));
                                                const char* resdesc = "(unknown)";
                                        {
                                                u16 rescode = ntohs(*(u16 *)(b));
                                                const char* resdesc = "(unknown)";

-                                               if (message == 4) { /* StopCCN */
+                                               if (message == 4)
+                                               { /* StopCCN */

                                                        if (rescode <= MAX_STOPCCN_RESULT_CODE)
                                                                resdesc = stopccn_result_codes[rescode];
                                                        if (rescode <= MAX_STOPCCN_RESULT_CODE)
                                                                resdesc = stopccn_result_codes[rescode];

-                                               } else if (message == 14) { /* CDN */
+                                               }
+                                               else if (message == 14)
+                                               { /* CDN */

                                                        if (rescode <= MAX_CDN_RESULT_CODE)
                                                                resdesc = cdn_result_codes[rescode];
                                                }
 
                                                        if (rescode <= MAX_CDN_RESULT_CODE)
                                                                resdesc = cdn_result_codes[rescode];
                                                }
 

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",

                                                        rescode, resdesc);
                                                        rescode, resdesc);

-                                               if (n >= 4) {
+                                               if (n >= 4)
+                                               {

                                                        u16 errcode = ntohs(*(u16 *)(b + 2));
                                                        const char* errdesc = "(unknown)";
                                                        if (errcode <= MAX_ERROR_CODE)
                                                                errdesc = error_codes[errcode];
                                                        u16 errcode = ntohs(*(u16 *)(b + 2));
                                                        const char* errdesc = "(unknown)";
                                                        if (errcode <= MAX_ERROR_CODE)
                                                                errdesc = error_codes[errcode];

-                                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",
+                                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",

                                                                errcode, errdesc);
                                                }
                                                                errcode, errdesc);
                                                }

-                                               if (n > 4) {
-                                                       /* %*s doesn't work?? */
-                                                       char *buf = (char *)strndup(b+4, n-4);
-                                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %s\n",
-                                                               buf);
-                                                       free(buf);
-                                               }
+                                               if (n > 4)
+                                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %.*s\n",
+                                                               n-4, b+4);
+

                                                break;
                                        }
                                        break;
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(u16 *) (b));
                                                break;
                                        }
                                        break;
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(u16 *) (b));

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Protocol version = %d\n", version);
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Protocol version = %d\n", version);

                                                if (version && version != 0x0100)
                                                {   // allow 0.0 and 1.0
                                                if (version && version != 0x0100)
                                                {   // allow 0.0 and 1.0

-                                                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "   Bad protocol version %04X\n",
+                                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "   Bad protocol version %04X\n",

                                                                        version);
                                                        fatal = flags;
                                                        continue; // next
                                                                        version);
                                                        fatal = flags;
                                                        continue; // next


@@ -1566,69 +1526,76 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        }
                                        break;
                                case 3:     // framing capabilities
                                        }
                                        break;
                                case 3:     // framing capabilities

-//                                     log(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
+//                                     LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");

                                        break;
                                case 4:     // bearer capabilities
                                        break;
                                case 4:     // bearer capabilities

-//                                     log(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
+//                                     LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");

                                        break;
                                case 5:         // tie breaker
                                        // We never open tunnels, so we don't care about tie breakers
                                        break;
                                case 5:         // tie breaker
                                        // We never open tunnels, so we don't care about tie breakers

-//                                     log(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
+//                                     LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");

                                        continue;
                                case 6:     // firmware revision
                                        continue;
                                case 6:     // firmware revision

-//                                     log(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
+//                                     LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");

                                        break;
                                case 7:     // host name
                                        memset(tunnel[t].hostname, 0, 128);
                                        memcpy(tunnel[t].hostname, b, (n >= 127) ? 127 : n);
                                        break;
                                case 7:     // host name
                                        memset(tunnel[t].hostname, 0, 128);
                                        memcpy(tunnel[t].hostname, b, (n >= 127) ? 127 : n);

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);

                                        // TBA - to send to RADIUS
                                        break;
                                case 8:     // vendor name
                                        // TBA - to send to RADIUS
                                        break;
                                case 8:     // vendor name

-                                       memset(tunnel[t].vendor, 0, 128);
-                                       memcpy(tunnel[t].vendor, b, (n >= 127) ? 127 : n);
-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
+                                       memset(tunnel[t].vendor, 0, sizeof(tunnel[t].vendor));
+                                       memcpy(tunnel[t].vendor, b, (n >= sizeof(tunnel[t].vendor) - 1) ? sizeof(tunnel[t].vendor) - 1 : n);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);

                                        break;
                                case 9:     // assigned tunnel
                                        tunnel[t].far = ntohs(*(u16 *) (b));
                                        break;
                                case 9:     // assigned tunnel
                                        tunnel[t].far = ntohs(*(u16 *) (b));

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Remote tunnel id = %d\n", tunnel[t].far);

                                        break;
                                case 10:    // rx window
                                        tunnel[t].window = ntohs(*(u16 *) (b));
                                        if (!tunnel[t].window)
                                                tunnel[t].window = 1; // window of 0 is silly
                                        break;
                                case 10:    // rx window
                                        tunnel[t].window = ntohs(*(u16 *) (b));
                                        if (!tunnel[t].window)
                                                tunnel[t].window = 1; // window of 0 is silly

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   rx window = %d\n", tunnel[t].window);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   rx window = %d\n", tunnel[t].window);

                                        break;
                                case 11:        // Challenge
                                        {
                                        break;
                                case 11:        // Challenge
                                        {

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   LAC requested CHAP authentication for tunnel\n");
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   LAC requested CHAP authentication for tunnel\n");

                                                build_chap_response(b, 2, n, &chapresponse);
                                        }
                                        break;
                                                build_chap_response(b, 2, n, &chapresponse);
                                        }
                                        break;

+                               case 13:    // Response
+                                       // Why did they send a response? We never challenge.
+                                       LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "   received unexpected challenge response\n");
+                                       break;
+

                                case 14:    // assigned session
                                        asession = session[s].far = ntohs(*(u16 *) (b));
                                case 14:    // assigned session
                                        asession = session[s].far = ntohs(*(u16 *) (b));

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);

                                        break;
                                case 15:    // call serial number
                                        break;
                                case 15:    // call serial number

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   call serial number = %d\n", ntohl(*(u32 *)b));
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   call serial number = %d\n", ntohl(*(u32 *)b));

                                        break;
                                case 18:    // bearer type
                                        break;
                                case 18:    // bearer type

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   bearer type = %d\n", ntohl(*(u32 *)b));
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   bearer type = %d\n", ntohl(*(u32 *)b));

                                        // TBA - for RADIUS
                                        break;
                                case 19:    // framing type
                                        // TBA - for RADIUS
                                        break;
                                case 19:    // framing type

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   framing type = %d\n", ntohl(*(u32 *)b));
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   framing type = %d\n", ntohl(*(u32 *)b));

                                        // TBA
                                        break;
                                case 21:    // called number
                                        memset(called, 0, MAXTEL);
                                        memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
                                        // TBA
                                        break;
                                case 21:    // called number
                                        memset(called, 0, MAXTEL);
                                        memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Called <%s>\n", called);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Called <%s>\n", called);

                                        break;
                                case 22:    // calling number
                                        memset(calling, 0, MAXTEL);
                                        memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
                                        break;
                                case 22:    // calling number
                                        memset(calling, 0, MAXTEL);
                                        memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
+                                       break;
+                               case 23:    // subtype

                                        break;
                                case 24:    // tx connect speed
                                        if (n == 4)
                                        break;
                                case 24:    // tx connect speed
                                        if (n == 4)


@@ -1642,7 +1609,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                                memcpy(tmp, b, (n >= 30) ? 30 : n);
                                                session[s].tx_connect_speed = atol(tmp);
                                        }
                                                memcpy(tmp, b, (n >= 30) ? 30 : n);
                                                session[s].tx_connect_speed = atol(tmp);
                                        }

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   TX connect speed <%u>\n",
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   TX connect speed <%u>\n",

                                                        session[s].tx_connect_speed);
                                        break;
                                case 38:    // rx connect speed
                                                        session[s].tx_connect_speed);
                                        break;
                                case 38:    // rx connect speed


@@ -1657,19 +1624,19 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                                memcpy(tmp, b, (n >= 30) ? 30 : n);
                                                session[s].rx_connect_speed = atol(tmp);
                                        }
                                                memcpy(tmp, b, (n >= 30) ? 30 : n);
                                                session[s].rx_connect_speed = atol(tmp);
                                        }

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   RX connect speed <%u>\n",
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   RX connect speed <%u>\n",

                                                        session[s].rx_connect_speed);
                                        break;
                                case 25:    // Physical Channel ID
                                        {
                                                u32 tmp = ntohl(*(u32 *)b);
                                                        session[s].rx_connect_speed);
                                        break;
                                case 25:    // Physical Channel ID
                                        {
                                                u32 tmp = ntohl(*(u32 *)b);

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Physical Channel ID <%X>\n", tmp);
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Physical Channel ID <%X>\n", tmp);

                                                break;
                                        }
                                case 29:    // Proxy Authentication Type
                                        {
                                                u16 authtype = ntohs(*(u16 *)b);
                                                break;
                                        }
                                case 29:    // Proxy Authentication Type
                                        {
                                                u16 authtype = ntohs(*(u16 *)b);

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Type %d (%s)\n",
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Type %d (%s)\n",

                                                        authtype, authtypes[authtype]);
                                                requestchap = (authtype == 2);
                                                break;
                                                        authtype, authtypes[authtype]);
                                                requestchap = (authtype == 2);
                                                break;


@@ -1678,20 +1645,20 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        {
                                                char authname[64] = {0};
                                                memcpy(authname, b, (n > 63) ? 63 : n);
                                        {
                                                char authname[64] = {0};
                                                memcpy(authname, b, (n > 63) ? 63 : n);

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Name (%s)\n",
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Name (%s)\n",

                                                        authname);
                                                break;
                                        }
                                case 31:    // Proxy Authentication Challenge
                                        {
                                                memcpy(radius[session[s].radius].auth, b, 16);
                                                        authname);
                                                break;
                                        }
                                case 31:    // Proxy Authentication Challenge
                                        {
                                                memcpy(radius[session[s].radius].auth, b, 16);

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Challenge\n");
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Challenge\n");

                                                break;
                                        }
                                case 32:    // Proxy Authentication ID
                                        {
                                                u16 authid = ntohs(*(u16 *)(b));
                                                break;
                                        }
                                case 32:    // Proxy Authentication ID
                                        {
                                                u16 authid = ntohs(*(u16 *)(b));

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth ID (%d)\n",
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth ID (%d)\n",

                                                        authid);
                                                if (session[s].radius)
                                                        radius[session[s].radius].id = authid;
                                                        authid);
                                                if (session[s].radius)
                                                        radius[session[s].radius].id = authid;


@@ -1701,56 +1668,40 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        {
                                                char authresp[64] = {0};
                                                memcpy(authresp, b, (n > 63) ? 63 : n);
                                        {
                                                char authresp[64] = {0};
                                                memcpy(authresp, b, (n > 63) ? 63 : n);

-                                               log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Response\n");
+                                               LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Response\n");

                                                break;
                                        }
                                case 27:    // last send lcp
                                        {        // find magic number
                                                u8 *p = b, *e = p + n;
                                                break;
                                        }
                                case 27:    // last send lcp
                                        {        // find magic number
                                                u8 *p = b, *e = p + n;

-                                               while (p < e && p[1])
+                                               while (p + 1 < e && p[1] && p + p[1] <= e)

                                                {
                                                {

-                                                       if (*p == 5 && p[1] == 6)
+                                                       if (*p == 5 && p[1] == 6) // Magic-Number

                                                                amagic = ntohl(*(u32 *) (p + 2));
                                                                amagic = ntohl(*(u32 *) (p + 2));

-                                                       else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5)
+                                                       else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol

                                                                chap = 1;
                                                                chap = 1;

-                                                       else if (*p == 7)
+                                                       else if (*p == 7) // Protocol-Field-Compression

                                                                aflags |= SESSIONPFC;
                                                                aflags |= SESSIONPFC;

-                                                       else if (*p == 8)
+                                                       else if (*p == 8) // Address-and-Control-Field-Compression

                                                                aflags |= SESSIONACFC;
                                                        p += p[1];
                                                }
                                                                aflags |= SESSIONACFC;
                                                        p += p[1];
                                                }

-
-                                               {
-                                                       char tmp[500] = {0};
-                                                       tmp[0] = ConfigReq;
-                                                       memcpy((tmp + 1), b, n);
-                                               }

                                        }
                                        break;
                                case 28:    // last recv lcp confreq
                                        }
                                        break;
                                case 28:    // last recv lcp confreq

-                                       {
-                                               char tmp[500] = {0};
-                                               tmp[0] = ConfigReq;
-                                               memcpy((tmp + 1), b, n);
-                                               break;
-                                       }
+                                       break;

                                case 26:    // Initial Received LCP CONFREQ
                                case 26:    // Initial Received LCP CONFREQ

-                                       {
-                                               char tmp[500] = {0};
-                                               tmp[0] = ConfigReq;
-                                               memcpy((tmp + 1), b, n);
-                                       }

                                        break;
                                case 39:    // seq required - we control it as an LNS anyway...
                                        break;
                                case 36:    // Random Vector
                                        break;
                                case 39:    // seq required - we control it as an LNS anyway...
                                        break;
                                case 36:    // Random Vector

-                                       log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Random Vector received. Enabled AVP Hiding.\n");
+                                       LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Random Vector received. Enabled AVP Hiding.\n");

                                        memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
                                        memcpy(session[s].random_vector, b, n);
                                        session[s].random_vector_length = n;
                                        break;
                                default:
                                        memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
                                        memcpy(session[s].random_vector, b, n);
                                        session[s].random_vector_length = n;
                                        break;
                                default:

-                                       log(2, ntohl(addr->sin_addr.s_addr), s, t, "   Unknown AVP type %d\n", mtype);
+                                       LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "   Unknown AVP type %d\n", mtype);

                                        fatal = flags;
                                        continue; // next
                                }
                                        fatal = flags;
                                        continue; // next
                                }


@@ -1818,8 +1769,8 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                                // make a RADIUS session
                                                if (!(r = radiusnew(s)))
                                                {
                                                // make a RADIUS session
                                                if (!(r = radiusnew(s)))
                                                {

-                                                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
-//                                                     sessionkill(s, "no free RADIUS sesions");
+                                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
+                                                       sessionkill(s, "no free RADIUS sesions");

                                                        return;
                                                }
 
                                                        return;
                                                }
 


@@ -1829,7 +1780,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                                session[s].tunnel = t;
                                                session[s].far = asession;
                                                session[s].last_packet = time_now;
                                                session[s].tunnel = t;
                                                session[s].far = asession;
                                                session[s].last_packet = time_now;

-                                               log(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+                                               LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);

                                                control16(c, 14, s, 1); // assigned session
                                                controladd(c, t, s); // send the reply
                                                {
                                                control16(c, 14, s, 1); // assigned session
                                                controladd(c, t, s); // send the reply
                                                {


@@ -1848,9 +1799,10 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        // TBA
                                        break;
                                case 12:      // ICCN
                                        // TBA
                                        break;
                                case 12:      // ICCN

+                                       if (amagic == 0) amagic = time_now;

                                        session[s].magic = amagic; // set magic number
                                        session[s].l2tp_flags = aflags; // set flags received
                                        session[s].magic = amagic; // set magic number
                                        session[s].l2tp_flags = aflags; // set flags received

-                                       log(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
+                                       LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);

                                        controlnull(t); // ack
                                        // In CHAP state, request PAP instead
                                        if (requestchap)
                                        controlnull(t); // ack
                                        // In CHAP state, request PAP instead
                                        if (requestchap)


@@ -1861,14 +1813,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                        sessionshutdown(s, "Closed (Received CDN)");
                                        break;
                                case 0xFFFF:
                                        sessionshutdown(s, "Closed (Received CDN)");
                                        break;
                                case 0xFFFF:

-                                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");
+                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");

                                        break;
                                default:
                                        STAT(tunnel_rx_errors);
                                        if (mandatorymessage & 0x80)
                                                tunnelshutdown(t, "Unknown message");
                                        else
                                        break;
                                default:
                                        STAT(tunnel_rx_errors);
                                        if (mandatorymessage & 0x80)
                                                tunnelshutdown(t, "Unknown message");
                                        else

-                                               log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
+                                               LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);

                                        break;
                                }
                        if (chapresponse) free(chapresponse);
                                        break;
                                }
                        if (chapresponse) free(chapresponse);


@@ -1876,14 +1828,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                }
                else
                {
                }
                else
                {

-                       log(4, 0, s, t, "   Got a ZLB ack\n");
+                       LOG(4, 0, s, t, "   Got a ZLB ack\n");

                }
        }
        else
        {                          // data
                u16 prot;
 
                }
        }
        else
        {                          // data
                u16 prot;
 

-               log_hex(5, "Receive Tunnel Data", p, l);
+               LOG_HEX(5, "Receive Tunnel Data", p, l);

                if (l > 2 && p[0] == 0xFF && p[1] == 0x03)
                {                     // HDLC address header, discard
                        p += 2;
                if (l > 2 && p[0] == 0xFF && p[1] == 0x03)
                {                     // HDLC address header, discard
                        p += 2;


@@ -1891,7 +1843,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                }
                if (l < 2)
                {
                }
                if (l < 2)
                {

-                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);
+                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);

                        STAT(tunnel_rx_errors);
                        return;
                }
                        STAT(tunnel_rx_errors);
                        return;
                }


@@ -1917,7 +1869,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                        }
 
 
                        }
 
 

-                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
+                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "

                                        "but no session[%d].tunnel exists (LAC said"
                                        " tunnel = %d). Dropping packet.\n", s, s, t);
                        STAT(tunnel_rx_errors);
                                        "but no session[%d].tunnel exists (LAC said"
                                        " tunnel = %d). Dropping packet.\n", s, s, t);
                        STAT(tunnel_rx_errors);


@@ -1926,7 +1878,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 
                if (session[s].die)
                {
 
                if (session[s].die)
                {

-                       log(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
+                       LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);

 // I'm pretty sure this isn't right -- mo.
 //                     return;              // closing session, PPP not processed
                }
 // I'm pretty sure this isn't right -- mo.
 //                     return;              // closing session, PPP not processed
                }


@@ -1962,57 +1914,41 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                }
                else if (prot == PPPIP)
                {
                }
                else if (prot == PPPIP)
                {

-                       if (!config->cluster_iam_master)
+                       session[s].last_packet = time_now;
+                       if (session[s].walled_garden && !config->cluster_iam_master)

                        {
                        {

-                               // We're a slave. Should we forward this packet to the master?
-
-                               // Is this a walled garden session, or something that needs it's
-                               // idle time updated??
-
-                               // Maintain the idle timeouts on the master. If this would
-                               // significantly reset the idletimeout, run it via the master
-                               // to refresh the master's idle timer.
-                               // Not sure this is ideal: It may re-order packets.
-
-                               if (session[s].walled_garden || (session[s].last_packet + (ECHO_TIMEOUT/2)) < time_now)
-                               {
-                                       master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
-                                       session[s].last_packet = time_now;
-                                       return;
-                               }
-                               // fall through to processipin.
-                       } else
-                               session[s].last_packet = time_now;
+                               master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
+                               return;
+                       }

                        processipin(t, s, p, l);
                }
                else
                {
                        STAT(tunnel_rx_errors);
                        processipin(t, s, p, l);
                }
                else
                {
                        STAT(tunnel_rx_errors);

-                       log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
+                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);

                }
        }
 }
 
                }
        }
 }
 

-// read and process packet on tap
-void processtap(u8 * buf, int len)
+// read and process packet on tun
+void processtun(u8 * buf, int len)

 {
 {

-       log_hex(5, "Receive TAP Data", buf, len);
-       STAT(tap_rx_packets);
-       INC_STAT(tap_rx_bytes, len);
+       LOG_HEX(5, "Receive TUN Data", buf, len);
+       STAT(tun_rx_packets);
+       INC_STAT(tun_rx_bytes, len);

 
 

-       CSTAT(call_processtap);
+       CSTAT(call_processtun);

 
        eth_rx_pkt++;
        eth_rx += len;
        if (len < 22)
        {
 
        eth_rx_pkt++;
        eth_rx += len;
        if (len < 22)
        {

-               log(1, 0, 0, 0, "Short tap packet %d bytes\n", len);
-               STAT(tap_rx_errors);
+               LOG(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
+               STAT(tun_rx_errors);

                return;
        }
                return;
        }

-       if (*(u16 *) (buf + 2) == htons(PKTARP)) // ARP
-               processarp(buf, len);
-       else if (*(u16 *) (buf + 2) == htons(PKTIP)) // IP
+
+       if (*(u16 *) (buf + 2) == htons(PKTIP)) // IP

                processipout(buf, len);
        // Else discard.
 }
                processipout(buf, len);
        // Else discard.
 }


@@ -2030,8 +1966,9 @@ int regular_cleanups(void)
        int count=0,i;
        u16 r;
        static clockt next_acct = 0;
        int count=0,i;
        u16 r;
        static clockt next_acct = 0;

+       int a;

 
 

-       log(3, 0, 0, 0, "Begin regular cleanup\n");
+       LOG(3, 0, 0, 0, "Begin regular cleanup\n");

 
        for (r = 1; r < MAXRADIUS; r++)
        {
 
        for (r = 1; r < MAXRADIUS; r++)
        {


@@ -2044,7 +1981,7 @@ int regular_cleanups(void)
                } else
                        radius[r].retry = backoff(radius[r].try+1);     // Is this really needed? --mo
        }
                } else
                        radius[r].retry = backoff(radius[r].try+1);     // Is this really needed? --mo
        }

-       for (t = 1; t < config->cluster_highest_tunnelid; t++)
+       for (t = 1; t <= config->cluster_highest_tunnelid; t++)

        {
                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)
        {
                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)


@@ -2077,37 +2014,25 @@ int regular_cleanups(void)
                {
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, t, 0); // send the message
                {
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, t, 0); // send the message

-                       log(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");
+                       LOG(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");

                }
                }

-       }

 
 

-       // Check for sessions that have been killed from the CLI
-       if (cli_session_kill[0])
-       {
-               int i;
-               for (i = 0; i < MAXSESSION && cli_session_kill[i]; i++)
-               {
-                       log(2, 0, cli_session_kill[i], 0, "Dropping session by CLI\n");
-                       sessionshutdown(cli_session_kill[i], "Requested by administrator");
-                       cli_session_kill[i] = 0;
-               }
-       }
-       // Check for tunnels that have been killed from the CLI
-       if (cli_tunnel_kill[0])
-       {
-               int i;
-               for (i = 1; i < MAXTUNNEL && cli_tunnel_kill[i]; i++)
+               // Check for tunnel changes requested from the CLI
+               if ((a = cli_tunnel_actions[t].action))

                {
                {

-                       log(2, 0, cli_tunnel_kill[i], 0, "Dropping tunnel by CLI\n");
-                       tunnelshutdown(cli_tunnel_kill[i], "Requested by administrator");
-                       cli_tunnel_kill[i] = 0;
+                       cli_tunnel_actions[t].action = 0;
+                       if (a & CLI_TUN_KILL)
+                       {
+                               LOG(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
+                               tunnelshutdown(t, "Requested by administrator");
+                       }

                }
                }

+

        }
 
        count = 0;
        for (i = 1; i <= config->cluster_highest_sessionid; i++)
        {
        }
 
        count = 0;
        for (i = 1; i <= config->cluster_highest_sessionid; i++)
        {

-

                s++;
                if (s > config->cluster_highest_sessionid)
                        s = 1;
                s++;
                if (s > config->cluster_highest_sessionid)
                        s = 1;


@@ -2115,10 +2040,10 @@ int regular_cleanups(void)
                if (!session[s].tunnel) // Session isn't in use
                        continue;
 
                if (!session[s].tunnel) // Session isn't in use
                        continue;
 

-               if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED) )
+               if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))

                {
                        // IPCP has not completed yet. Resend
                {
                        // IPCP has not completed yet. Resend

-                       log(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
+                       LOG(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");

                        sendipcp(session[s].tunnel, s);
                }
 
                        sendipcp(session[s].tunnel, s);
                }
 


@@ -2145,8 +2070,9 @@ int regular_cleanups(void)
                        u8 b[MAXCONTROL] = {0};
 
                        u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
                        u8 b[MAXCONTROL] = {0};
 
                        u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);

-                       if (!q) {
-                               log(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
+                       if (!q)
+                       {
+                               LOG(3, session[s].ip, s, t, "failed to send ECHO packet.\n");

                                continue;
                        }
 
                                continue;
                        }
 


@@ -2155,14 +2081,66 @@ int regular_cleanups(void)
                        *(u16 *)(q + 2) = htons(8); // Length
                        *(u32 *)(q + 4) = 0; // Magic Number (not supported)
 
                        *(u16 *)(q + 2) = htons(8); // Length
                        *(u32 *)(q + 4) = 0; // Magic Number (not supported)
 

-                       log(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
+                       LOG(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",

                                        (int)(time_now - session[s].last_packet));
                        tunnelsend(b, 24, session[s].tunnel); // send it
                        if (++count >= MAX_ACTIONS) break;
                                        (int)(time_now - session[s].last_packet));
                        tunnelsend(b, 24, session[s].tunnel); // send it
                        if (++count >= MAX_ACTIONS) break;

-                       continue;
+               }
+
+               // Check for actions requested from the CLI
+               if ((a = cli_session_actions[s].action))
+               {
+                       int send = 0;
+
+                       cli_session_actions[s].action = 0;
+                       if (a & CLI_SESS_KILL)
+                       {
+                               LOG(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
+                               sessionshutdown(s, "Requested by administrator");
+                               a = 0; // dead, no need to check for other actions
+                       }
+
+                       if (a & CLI_SESS_NOSNOOP)
+                       {
+                               LOG(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
+                               session[s].snoop_ip = 0;
+                               session[s].snoop_port = 0;
+                               send++;
+                       }
+                       else if (a & CLI_SESS_SNOOP)
+                       {
+                               LOG(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+                                   inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
+
+                               session[s].snoop_ip = cli_session_actions[s].snoop_ip;
+                               session[s].snoop_port = cli_session_actions[s].snoop_port;
+                               send++;
+                       }
+
+                       if (a & CLI_SESS_NOTHROTTLE)
+                       {
+                               LOG(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
+                               throttle_session(s, 0, 0);
+                               send++;
+                       }
+                       else if (a & CLI_SESS_THROTTLE)
+                       {
+                               LOG(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
+                                   cli_session_actions[s].throttle_in,
+                                   cli_session_actions[s].throttle_out);
+
+                               throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);
+                               send++;
+                       }
+
+                       if (send)
+                               cluster_send_session(s);
+
+                       if (++count >= MAX_ACTIONS) break;

                }
        }
                }
        }

-       if (config->accounting_dir && next_acct <= TIME)
+
+       if (*config->accounting_dir && next_acct <= TIME)

        {
                // Dump accounting data
                next_acct = TIME + ACCT_TIME;
        {
                // Dump accounting data
                next_acct = TIME + ACCT_TIME;


@@ -2172,7 +2150,7 @@ int regular_cleanups(void)
        if (count >= MAX_ACTIONS)
                return 1;       // Didn't finish!
 
        if (count >= MAX_ACTIONS)
                return 1;       // Didn't finish!
 

-       log(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
+       LOG(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);

        return 0;
 }
 
        return 0;
 }
 


@@ -2184,18 +2162,31 @@ int regular_cleanups(void)
 int still_busy(void)
 {
        int i;
 int still_busy(void)
 {
        int i;

-       static int last_talked = 0;
-       for (i = config->cluster_highest_tunnelid ; i > 0 ; --i) {
+       static clockt last_talked = 0;
+       static clockt start_busy_wait = 0;
+       if (start_busy_wait == 0)
+               start_busy_wait = TIME;
+
+       for (i = config->cluster_highest_tunnelid ; i > 0 ; --i)
+       {

                if (!tunnel[i].controlc)
                        continue;
 
                if (!tunnel[i].controlc)
                        continue;
 

-               if (last_talked != TIME) {
-                       log(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
+               if (last_talked != TIME)
+               {
+                       LOG(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);

                        last_talked = TIME;
                }
                return 1;
        }
 
                        last_talked = TIME;
                }
                return 1;
        }
 

+       // We stop waiting for radius after BUSY_WAIT_TIME 1/10th seconds
+       if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIME)
+       {
+               LOG(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
+               return 0;
+       }
+

        for (i = 1; i < MAXRADIUS; i++)
        {
                if (radius[i].state == RADIUSNULL)
        for (i = 1; i < MAXRADIUS; i++)
        {
                if (radius[i].state == RADIUSNULL)


@@ -2203,8 +2194,9 @@ int still_busy(void)
                if (radius[i].state == RADIUSWAIT)
                        continue;
 
                if (radius[i].state == RADIUSWAIT)
                        continue;
 

-               if (last_talked != TIME) {
-                       log(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
+               if (last_talked != TIME)
+               {
+                       LOG(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);

                        last_talked = TIME;
                }
                return 1;
                        last_talked = TIME;
                }
                return 1;


@@ -2213,42 +2205,37 @@ int still_busy(void)
        return 0;
 }
 
        return 0;
 }
 

-// main loop - gets packets on tap or udp and processes them
+static fd_set readset;
+static int readset_n = 0;
+
+// main loop - gets packets on tun or udp and processes them

 void mainloop(void)
 {
 void mainloop(void)
 {

-       fd_set cr;
-       int cn, i;
+       int i;

        u8 buf[65536];
        struct timeval to;
        u8 buf[65536];
        struct timeval to;

-       time_t next_cluster_ping = 0;   // default 1 second pings.
-       clockt next_clean = time_now + config->cleanup_interval;
-
-       log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tapfd=%d, cluster_sockfd=%d, controlfd=%d\n",
-                       udpfd, tapfd, cluster_sockfd, controlfd);
-
-       FD_ZERO(&cr);
-       FD_SET(udpfd, &cr);
-       FD_SET(tapfd, &cr);
-       FD_SET(controlfd, &cr);
-       FD_SET(clifd, &cr);
-       if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
-       cn = udpfd;
-       if (cn < tapfd) cn = tapfd;
-       if (cn < controlfd) cn = controlfd;
-       if (cn < clifd) cn = clifd;
-       if (cn < cluster_sockfd) cn = cluster_sockfd;
-       for (i = 0; i < config->num_radfds; i++)
-       {
-               if (!radfds[i]) continue;
-               FD_SET(radfds[i], &cr);
-               if (radfds[i] > cn)
-                       cn = radfds[i];
-       }
+       clockt next_cluster_ping = 0;   // send initial ping immediately
+       time_t next_clean = time_now + config->cleanup_interval;
+
+       LOG(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
+                       udpfd, tunfd, cluster_sockfd, controlfd);
+
+       FD_ZERO(&readset);
+       FD_SET(udpfd, &readset);
+       FD_SET(tunfd, &readset);
+       FD_SET(controlfd, &readset);
+       FD_SET(clifd, &readset);
+       if (cluster_sockfd) FD_SET(cluster_sockfd, &readset);
+       readset_n = udpfd;
+       if (tunfd > readset_n)          readset_n = tunfd;
+       if (controlfd > readset_n)      readset_n = controlfd;
+       if (clifd > readset_n)          readset_n = clifd;
+       if (cluster_sockfd > readset_n) readset_n = cluster_sockfd;

 
        while (!main_quit || still_busy())
        {
                fd_set r;
 
        while (!main_quit || still_busy())
        {
                fd_set r;

-               int n = cn;
+               int n = readset_n;

 #ifdef BGP
                fd_set w;
                int bgp_set[BGP_NUM_PEERS];
 #ifdef BGP
                fd_set w;
                int bgp_set[BGP_NUM_PEERS];


@@ -2260,7 +2247,7 @@ void mainloop(void)
                        update_config();
                }
 
                        update_config();
                }
 

-               memcpy(&r, &cr, sizeof(fd_set));
+               memcpy(&r, &readset, sizeof(fd_set));

                to.tv_sec = 0;
                to.tv_usec = 100000; // 1/10th of a second.
 
                to.tv_sec = 0;
                to.tv_usec = 100000; // 1/10th of a second.
 


@@ -2292,10 +2279,11 @@ void mainloop(void)
                TIME = now();
                if (n < 0)
                {
                TIME = now();
                if (n < 0)
                {

-                       if (errno == EINTR)
+                       if (errno == EINTR ||
+                           errno == ECHILD) // EINTR was clobbered by sigchild_handler()

                                continue;
 
                                continue;
 

-                       log(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
+                       LOG(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));

                        main_quit++;
                        break;
                }
                        main_quit++;
                        break;
                }


@@ -2314,27 +2302,33 @@ void mainloop(void)
                                                break;
                                }
                        }
                                                break;
                                }
                        }

-                       if (FD_ISSET(tapfd, &r))
+                       if (FD_ISSET(tunfd, &r))

                        {
                                int c, n;
                                for (c = 0; c < config->multi_read_count; c++)
                                {
                        {
                                int c, n;
                                for (c = 0; c < config->multi_read_count; c++)
                                {

-                                       if ((n = read(tapfd, buf, sizeof(buf))) > 0)
-                                               processtap(buf, n);
+                                       if ((n = read(tunfd, buf, sizeof(buf))) > 0)
+                                               processtun(buf, n);

                                        else
                                                break;
                                }
                        }
                                        else
                                                break;
                                }
                        }

-                       for (i = 0; i < config->num_radfds; i++)
-                               if (FD_ISSET(radfds[i], &r))
-                                       processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
-                       if (FD_ISSET(cluster_sockfd, &r)) {
+
+                       if (config->cluster_iam_master)
+                               for (i = 0; i < config->num_radfds; i++)
+                                       if (FD_ISSET(radfds[i], &r))
+                                               processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
+
+                       if (FD_ISSET(cluster_sockfd, &r))
+                       {

                                int size;
                                size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
                                processcluster(buf, size, addr.sin_addr.s_addr);
                        }
                                int size;
                                size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
                                processcluster(buf, size, addr.sin_addr.s_addr);
                        }

+

                        if (FD_ISSET(controlfd, &r))
                                processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
                        if (FD_ISSET(controlfd, &r))
                                processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);

+

                        if (FD_ISSET(clifd, &r))
                        {
                                struct sockaddr_in addr;
                        if (FD_ISSET(clifd, &r))
                        {
                                struct sockaddr_in addr;


@@ -2343,7 +2337,7 @@ void mainloop(void)
 
                                if ((sockfd = accept(clifd, (struct sockaddr *)&addr, &len)) <= 0)
                                {
 
                                if ((sockfd = accept(clifd, (struct sockaddr *)&addr, &len)) <= 0)
                                {

-                                       log(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
+                                       LOG(0, 0, 0, 0, "accept error: %s\n", strerror(errno));

                                        continue;
                                }
                                else
                                        continue;
                                }
                                else


@@ -2355,16 +2349,22 @@ void mainloop(void)
                }
 
                        // Runs on every machine (master and slaves).
                }
 
                        // Runs on every machine (master and slaves).

-               if (cluster_sockfd && next_cluster_ping <= time_now)
+               if (cluster_sockfd && next_cluster_ping <= TIME)

                {
                        // Check to see which of the cluster is still alive..
                {
                        // Check to see which of the cluster is still alive..

-                       next_cluster_ping = time_now + 1;
-                       cluster_send_ping(basetime);

 
 

-                       cluster_check_master();
+                       cluster_send_ping(basetime);    // Only does anything if we're a slave
+                       cluster_check_master();         // ditto.
+
+                       cluster_heartbeat();            // Only does anything if we're a master.
+                       cluster_check_slaves();         // ditto.

 
 

-                       cluster_heartbeat(config->cluster_highest_sessionid, sessionfree, config->cluster_highest_tunnelid);    // Only does anything if we're a master.

                        master_update_counts();         // If we're a slave, send our byte counters to our master.
                        master_update_counts();         // If we're a slave, send our byte counters to our master.

+
+                       if (config->cluster_iam_master && !config->cluster_iam_uptodate)
+                               next_cluster_ping = TIME + 1; // out-of-date slaves, do fast updates
+                       else
+                               next_cluster_ping = TIME + config->cluster_hb_interval;

                }
 
                        // Run token bucket filtering queue..
                }
 
                        // Run token bucket filtering queue..


@@ -2372,7 +2372,8 @@ void mainloop(void)
                        // Runs on all machines both master and slave.
                {
                        static clockt last_run = 0;
                        // Runs on all machines both master and slave.
                {
                        static clockt last_run = 0;

-                       if (last_run != TIME) {
+                       if (last_run != TIME)
+                       {

                                last_run = TIME;
                                tbf_run_timer();
                        }
                                last_run = TIME;
                                tbf_run_timer();
                        }


@@ -2382,10 +2383,15 @@ void mainloop(void)
                 * something to read, else under load this will never actually run....
                 *
                 */
                 * something to read, else under load this will never actually run....
                 *
                 */

-               if (config->cluster_iam_master && next_clean <= time_now) {
-                       if (regular_cleanups()) { // Did it finish?
+               if (config->cluster_iam_master && next_clean <= time_now)
+               {
+                       if (regular_cleanups())
+                       {
+                               // Did it finish?

                                next_clean = time_now + 1 ;     // Didn't finish. Check quickly.
                                next_clean = time_now + 1 ;     // Didn't finish. Check quickly.

-                       } else {
+                       }
+                       else
+                       {

                                next_clean = time_now + config->cleanup_interval; // Did. Move to next interval.
                        }
                }
                                next_clean = time_now + config->cleanup_interval; // Did. Move to next interval.
                        }
                }


@@ -2401,11 +2407,8 @@ void mainloop(void)
        }
 
                // Are we the master and shutting down??
        }
 
                // Are we the master and shutting down??

-       if (config->cluster_iam_master) {
-
-               cluster_heartbeat(config->cluster_highest_sessionid, sessionfree,
-                       config->cluster_highest_tunnelid);      // Flush any queued changes..
-       }
+       if (config->cluster_iam_master)
+               cluster_heartbeat(); // Flush any queued changes..

 
                // Ok. Notify everyone we're shutting down. If we're
                // the master, this will force an election.
 
                // Ok. Notify everyone we're shutting down. If we're
                // the master, this will force an election.


@@ -2415,82 +2418,144 @@ void mainloop(void)
        // Important!!! We MUST not process any packets past this point!
 }
 
        // Important!!! We MUST not process any packets past this point!
 }
 

+static void stripdomain(char *host)
+{
+       char *p;
+
+       if ((p = strchr(host, '.')))
+       {
+               char *domain = 0;
+               char _domain[1024];
+
+               // strip off domain
+               FILE *resolv = fopen("/etc/resolv.conf", "r");
+               if (resolv)
+               {
+                       char buf[1024];
+                       char *b;
+
+                       while (fgets(buf, sizeof(buf), resolv))
+                       {
+                               if (strncmp(buf, "domain", 6) && strncmp(buf, "search", 6))
+                                       continue;
+
+                               if (!isspace(buf[6]))
+                                       continue;
+
+                               b = buf + 7;
+                               while (isspace(*b)) b++;
+
+                               if (*b)
+                               {
+                                       char *d = b;
+                                       while (*b && !isspace(*b)) b++;
+                                       *b = 0;
+                                       if (buf[0] == 'd') // domain is canonical
+                                       {
+                                               domain = d;
+                                               break;
+                                       }
+
+                                       // first search line
+                                       if (!domain)
+                                       {
+                                               // hold, may be subsequent domain line
+                                               strncpy(_domain, d, sizeof(_domain))[sizeof(_domain)-1] = 0;
+                                               domain = _domain;
+                                       }
+                               }
+                       }
+
+                       fclose(resolv);
+               }
+
+               if (domain)
+               {
+                       int hl = strlen(host);
+                       int dl = strlen(domain);
+                       if (dl < hl && host[hl - dl - 1] == '.' && !strcmp(host + hl - dl, domain))
+                               host[hl -dl - 1] = 0;
+               }
+               else
+               {
+                       *p = 0; // everything after first dot
+               }
+       }
+}
+

 // Init data structures
 // Init data structures

-void initdata(void)
+void initdata(int optdebug, char *optconfig)

 {
        int i;
 
 {
        int i;
 

-       _statistics = mmap(NULL, sizeof(struct Tstats), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (_statistics == MAP_FAILED)
+       if (!(_statistics = shared_malloc(sizeof(struct Tstats))))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for _statistics: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       config = mmap(NULL, sizeof(struct configt), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (config == MAP_FAILED)
+       if (!(config = shared_malloc(sizeof(struct configt))))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for configuration: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));

                exit(1);
        }
        memset(config, 0, sizeof(struct configt));
        time(&config->start_time);
                exit(1);
        }
        memset(config, 0, sizeof(struct configt));
        time(&config->start_time);

-       strncpy(config->config_file, CONFIGFILE, sizeof(config->config_file) - 1);
-       tunnel = mmap(NULL, sizeof(tunnelt) * MAXTUNNEL, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (tunnel == MAP_FAILED)
+       strncpy(config->config_file, optconfig, strlen(optconfig));
+       config->debug = optdebug;
+       config->num_tbfs = MAXTBFS;
+       config->rl_rate = 28; // 28kbps
+
+       if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for tunnels: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       session = mmap(NULL, sizeof(sessiont) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (session == MAP_FAILED)
+       if (!(session = shared_malloc(sizeof(sessiont) * MAXSESSION)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for sessions: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for sessions: %s\n", strerror(errno));

                exit(1);
        }
 
                exit(1);
        }
 

-       sess_count = mmap(NULL, sizeof(sessioncountt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (sess_count == MAP_FAILED)
+       if (!(sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for sessions_count: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for sessions_count: %s\n", strerror(errno));

                exit(1);
        }
 
                exit(1);
        }
 

-       radius = mmap(NULL, sizeof(radiust) * MAXRADIUS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (radius == MAP_FAILED)
+       if (!(radius = shared_malloc(sizeof(radiust) * MAXRADIUS)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for radius: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       ip_address_pool = mmap(NULL, sizeof(ippoolt) * MAXIPPOOL, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (ip_address_pool == MAP_FAILED)
+
+       if (!(ip_address_pool = shared_malloc(sizeof(ippoolt) * MAXIPPOOL)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

+

 #ifdef RINGBUFFER
 #ifdef RINGBUFFER

-       ringbuffer = mmap(NULL, sizeof(struct Tringbuffer), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (ringbuffer == MAP_FAILED)
+       if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));

                exit(1);
        }
        memset(ringbuffer, 0, sizeof(struct Tringbuffer));
 #endif
 
                exit(1);
        }
        memset(ringbuffer, 0, sizeof(struct Tringbuffer));
 #endif
 

-       cli_session_kill = mmap(NULL, sizeof(sessionidt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (cli_session_kill == MAP_FAILED)
+       if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for cli session kill: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       memset(cli_session_kill, 0, sizeof(sessionidt) * MAXSESSION);
-       cli_tunnel_kill = mmap(NULL, sizeof(tunnelidt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (cli_tunnel_kill == MAP_FAILED)
+       memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
+
+       if (!(cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for cli tunnel kill: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));

                exit(1);
        }
                exit(1);
        }

-       memset(cli_tunnel_kill, 0, sizeof(tunnelidt) * MAXSESSION);
+       memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);

 
        memset(tunnel, 0, sizeof(tunnelt) * MAXTUNNEL);
        memset(session, 0, sizeof(sessiont) * MAXSESSION);
 
        memset(tunnel, 0, sizeof(tunnelt) * MAXTUNNEL);
        memset(session, 0, sizeof(sessiont) * MAXSESSION);


@@ -2498,7 +2563,8 @@ void initdata(void)
        memset(ip_address_pool, 0, sizeof(ippoolt) * MAXIPPOOL);
 
                // Put all the sessions on the free list marked as undefined.
        memset(ip_address_pool, 0, sizeof(ippoolt) * MAXIPPOOL);
 
                // Put all the sessions on the free list marked as undefined.

-       for (i = 1; i < MAXSESSION - 1; i++) {
+       for (i = 1; i < MAXSESSION - 1; i++)
+       {

                session[i].next = i + 1;
                session[i].tunnel = T_UNDEF;    // mark it as not filled in.
        }
                session[i].next = i + 1;
                session[i].tunnel = T_UNDEF;    // mark it as not filled in.
        }


@@ -2506,22 +2572,22 @@ void initdata(void)
        sessionfree = 1;
 
                // Mark all the tunnels as undefined (waiting to be filled in by a download).
        sessionfree = 1;
 
                // Mark all the tunnels as undefined (waiting to be filled in by a download).

-       for (i = 1; i < MAXTUNNEL- 1; i++) {
+       for (i = 1; i < MAXTUNNEL- 1; i++)

                tunnel[i].state = TUNNELUNDEF;  // mark it as not filled in.
                tunnel[i].state = TUNNELUNDEF;  // mark it as not filled in.

-       }

 
        if (!*hostname)
        {
                // Grab my hostname unless it's been specified
                gethostname(hostname, sizeof(hostname));
 
        if (!*hostname)
        {
                // Grab my hostname unless it's been specified
                gethostname(hostname, sizeof(hostname));

+               stripdomain(hostname);

        }
        }

+

        _statistics->start_time = _statistics->last_reset = time(NULL);
 
 #ifdef BGP
        _statistics->start_time = _statistics->last_reset = time(NULL);
 
 #ifdef BGP

-       bgp_peers = mmap(NULL, sizeof(struct bgp_peer) * BGP_NUM_PEERS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (bgp_peers == MAP_FAILED)
+       if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))

        {
        {

-               log(0, 0, 0, 0, "Error doing mmap for bgp: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));

                exit(1);
        }
 #endif /* BGP */
                exit(1);
        }
 #endif /* BGP */


@@ -2539,7 +2605,7 @@ int assign_ip_address(sessionidt s)
 {
        u32 i;
        int best = -1;
 {
        u32 i;
        int best = -1;

-       clockt best_time = time_now;
+       time_t best_time = time_now;

        char *u = session[s].user;
        char reuse = 0;
 
        char *u = session[s].user;
        char reuse = 0;
 


@@ -2568,7 +2634,7 @@ int assign_ip_address(sessionidt s)
 
        if (best < 0)
        {
 
        if (best < 0)
        {

-               log(0, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
+               LOG(0, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");

                return 0;
        }
 
                return 0;
        }
 


@@ -2586,7 +2652,7 @@ int assign_ip_address(sessionidt s)
                strncpy(ip_address_pool[best].user, u, sizeof(ip_address_pool[best].user) - 1);
 
        STAT(ip_allocated);
                strncpy(ip_address_pool[best].user, u, sizeof(ip_address_pool[best].user) - 1);
 
        STAT(ip_allocated);

-       log(4, ip_address_pool[best].address, s, session[s].tunnel,
+       LOG(4, ip_address_pool[best].address, s, session[s].tunnel,

                "assign_ip_address(): %s ip address %d from pool\n", reuse ? "Reusing" : "Allocating", best);
 
        return 1;
                "assign_ip_address(): %s ip address %d from pool\n", reuse ? "Reusing" : "Allocating", best);
 
        return 1;


@@ -2628,7 +2694,8 @@ void rebuild_address_pool(void)
                //
                // Zero the IP pool allocation, and build
                // a map from IP address to pool index.
                //
                // Zero the IP pool allocation, and build
                // a map from IP address to pool index.

-       for (i = 1; i < MAXIPPOOL; ++i) {
+       for (i = 1; i < MAXIPPOOL; ++i)
+       {

                ip_address_pool[i].assigned = 0;
                ip_address_pool[i].session = 0;
                if (!ip_address_pool[i].address)
                ip_address_pool[i].assigned = 0;
                ip_address_pool[i].session = 0;
                if (!ip_address_pool[i].address)


@@ -2637,25 +2704,29 @@ void rebuild_address_pool(void)
                cache_ipmap(ip_address_pool[i].address, -i);    // Map pool IP to pool index.
        }
 
                cache_ipmap(ip_address_pool[i].address, -i);    // Map pool IP to pool index.
        }
 

-       for (i = 0; i < MAXSESSION; ++i) {
+       for (i = 0; i < MAXSESSION; ++i)
+       {

                int ipid;
                if (!session[i].ip || !session[i].tunnel)
                        continue;
                ipid = - lookup_ipmap(htonl(session[i].ip));
 
                int ipid;
                if (!session[i].ip || !session[i].tunnel)
                        continue;
                ipid = - lookup_ipmap(htonl(session[i].ip));
 

-               if (session[i].ip_pool_index < 0) {     // Not allocated out of the pool.
+               if (session[i].ip_pool_index < 0)
+               {
+                       // Not allocated out of the pool.

                        if (ipid < 1)                   // Not found in the pool either? good.
                                continue;
 
                        if (ipid < 1)                   // Not found in the pool either? good.
                                continue;
 

-                       log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
+                       LOG(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",

                                i, inet_toa(session[i].ip), ipid);
 
                        // Fall through and process it as part of the pool.
                }
 
 
                                i, inet_toa(session[i].ip), ipid);
 
                        // Fall through and process it as part of the pool.
                }
 
 

-               if (ipid > MAXIPPOOL || ipid < 0) {
-                       log(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
+               if (ipid > MAXIPPOOL || ipid < 0)
+               {
+                       LOG(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);

                        ipid = -1;
                        session[i].ip_pool_index = ipid;
                        continue;
                        ipid = -1;
                        session[i].ip_pool_index = ipid;
                        continue;


@@ -2715,7 +2786,7 @@ void add_to_ip_pool(u32 addr, u32 mask)
                ++ip_pool_size;
                if (ip_pool_size >= MAXIPPOOL)
                {
                ++ip_pool_size;
                if (ip_pool_size >= MAXIPPOOL)
                {

-                       log(0,0,0,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );
+                       LOG(0,0,0,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );

                        return;
                }
        }
                        return;
                }
        }


@@ -2731,7 +2802,7 @@ void initippool()
 
        if (!(f = fopen(IPPOOLFILE, "r")))
        {
 
        if (!(f = fopen(IPPOOLFILE, "r")))
        {

-               log(0, 0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));

                exit(1);
        }
 
                exit(1);
        }
 


@@ -2750,7 +2821,7 @@ void initippool()
                        src = inet_addr(buf);
                        if (src == INADDR_NONE)
                        {
                        src = inet_addr(buf);
                        if (src == INADDR_NONE)
                        {

-                               log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
+                               LOG(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);

                                exit(1);
                        }
                        // This entry is for a specific IP only
                                exit(1);
                        }
                        // This entry is for a specific IP only


@@ -2765,18 +2836,18 @@ void initippool()
                        int numbits = 0;
                        u32 start = 0, mask = 0;
 
                        int numbits = 0;
                        u32 start = 0, mask = 0;
 

-                       log(2, 0, 0, 0, "Adding IP address range %s\n", buf);
+                       LOG(2, 0, 0, 0, "Adding IP address range %s\n", buf);

                        *p++ = 0;
                        if (!*p || !(numbits = atoi(p)))
                        {
                        *p++ = 0;
                        if (!*p || !(numbits = atoi(p)))
                        {

-                               log(0, 0, 0, 0, "Invalid pool range %s\n", buf);
+                               LOG(0, 0, 0, 0, "Invalid pool range %s\n", buf);

                                continue;
                        }
                        start = ntohl(inet_addr(pool));
                        mask = (u32)(pow(2, numbits) - 1) << (32 - numbits);
 
                        // Add a static route for this pool
                                continue;
                        }
                        start = ntohl(inet_addr(pool));
                        mask = (u32)(pow(2, numbits) - 1) << (32 - numbits);
 
                        // Add a static route for this pool

-                       log(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
+                       LOG(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);

                        routeset(0, start, mask, 0, 1);
 
                        add_to_ip_pool(start, mask);
                        routeset(0, start, mask, 0, 1);
 
                        add_to_ip_pool(start, mask);


@@ -2788,102 +2859,111 @@ void initippool()
                }
        }
        fclose(f);
                }
        }
        fclose(f);

-       log(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
+       LOG(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);

 }
 
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 {
 }
 
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 {

+       struct sockaddr_in snoop_addr = {0};

        if (!destination || !port || snoopfd <= 0 || size <= 0 || !packet)
                return;
 
        if (!destination || !port || snoopfd <= 0 || size <= 0 || !packet)
                return;
 

+       snoop_addr.sin_family = AF_INET;

        snoop_addr.sin_addr.s_addr = destination;
        snoop_addr.sin_port = ntohs(port);
 
        snoop_addr.sin_addr.s_addr = destination;
        snoop_addr.sin_port = ntohs(port);
 

-       log(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",
+       LOG(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",

                        packet, size, inet_toa(snoop_addr.sin_addr.s_addr), htons(snoop_addr.sin_port));
        if (sendto(snoopfd, packet, size, MSG_DONTWAIT | MSG_NOSIGNAL, (void *) &snoop_addr, sizeof(snoop_addr)) < 0)
                        packet, size, inet_toa(snoop_addr.sin_addr.s_addr), htons(snoop_addr.sin_port));
        if (sendto(snoopfd, packet, size, MSG_DONTWAIT | MSG_NOSIGNAL, (void *) &snoop_addr, sizeof(snoop_addr)) < 0)

-               log(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));

        STAT(packets_snooped);
 }
 
 void dump_acct_info()
 {
        STAT(packets_snooped);
 }
 
 void dump_acct_info()
 {

-    char filename[1024];
-    char timestr[64];
-    time_t t = time(NULL);
-    int i;
-    FILE *f = NULL;
+       char filename[1024];
+       char timestr[64];
+       time_t t = time(NULL);
+       int i;
+       FILE *f = NULL;

 
 
 
 

-    CSTAT(call_dump_acct_info);
+       CSTAT(call_dump_acct_info);

 
 

-    strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
-    snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);
+       strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
+       snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);

 
 

-    for (i = 0; i < MAXSESSION; i++)
-    {
-       if (!session[i].opened || !session[i].ip || !session[i].cin || !session[i].cout || !*session[i].user || session[i].walled_garden)
-               continue;
-       if (!f)
+       for (i = 0; i < MAXSESSION; i++)

        {
        {

-           time_t now = time(NULL);
-           if (!(f = fopen(filename, "w")))
-           {
-                   log(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
-                   return;
-           }
-           log(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
-           fprintf(f, "# dslwatch.pl dump file V1.01\n"
-               "# host: %s\n"
-               "# time: %ld\n"
-               "# uptime: %ld\n"
-               "# format: username ip qos uptxoctets downrxoctets\n",
-                   hostname,
-                   now,
-                   now - basetime);
-       }
-
-       log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
-       fprintf(f, "%s %s %d %u %u\n",
-           session[i].user,                            // username
-           inet_toa(htonl(session[i].ip)),             // ip
-           (session[i].throttle) ? 2 : 1,              // qos
-           (u32)session[i].cin,                // uptxoctets
-           (u32)session[i].cout);              // downrxoctets
-
-       session[i].pin = session[i].cin = 0;
-       session[i].pout = session[i].cout = 0;
-    }
-
-    if (f) fclose(f);
+               if (!session[i].opened || !session[i].ip || !(session[i].cin || session[i].cout) || !*session[i].user || session[i].walled_garden)
+                       continue;
+               if (!f)
+               {
+                       time_t now = time(NULL);
+                       if (!(f = fopen(filename, "w")))
+                       {
+                               LOG(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
+                               return ;
+                       }
+                       LOG(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
+                       fprintf(f, "# dslwatch.pl dump file V1.01\n"
+                               "# host: %s\n"
+                               "# time: %ld\n"
+                               "# uptime: %ld\n"
+                               "# format: username ip qos uptxoctets downrxoctets\n",
+                               hostname,
+                               now,
+                               now - basetime);
+               }
+
+               LOG(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
+               fprintf(f, "%s %s %d %u %u\n",
+                       session[i].user,                                                // username
+                       inet_toa(htonl(session[i].ip)),                                 // ip
+                       (session[i].throttle_in || session[i].throttle_out) ? 2 : 1,    // qos
+                       (u32)session[i].cin,                                            // uptxoctets
+                       (u32)session[i].cout);                                          // downrxoctets
+
+               session[i].pin = session[i].cin = 0;
+               session[i].pout = session[i].cout = 0;
+       }
+
+       if (f)
+               fclose(f);

 }
 
 // Main program
 int main(int argc, char *argv[])
 {
        int o;
 }
 
 // Main program
 int main(int argc, char *argv[])
 {
        int o;

+       int optdebug = 0;
+       char *optconfig = CONFIGFILE;

 
        _program_name = strdup(argv[0]);
 
        time(&basetime);             // start clock
 
        // scan args
 
        _program_name = strdup(argv[0]);
 
        time(&basetime);             // start clock
 
        // scan args

-       while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
+       while ((o = getopt(argc, argv, "dvc:h:")) >= 0)

        {
                switch (o)
                {
                        case 'd':
        {
                switch (o)
                {
                        case 'd':

-                               // Double fork to detach from terminal
-                               if (fork()) exit(0);

                                if (fork()) exit(0);
                                if (fork()) exit(0);

+                               setsid();
+                               freopen("/dev/null", "r", stdin);
+                               freopen("/dev/null", "w", stdout);
+                               freopen("/dev/null", "w", stderr);

                                break;
                        case 'v':
                                break;
                        case 'v':

-                               config->debug++;
+                               optdebug++;
+                               break;
+                       case 'c':
+                               optconfig = optarg;

                                break;
                        case 'h':
                                break;
                        case 'h':

-                               strncpy(hostname, optarg, 999);
+                               snprintf(hostname, sizeof(hostname), "%s", optarg);

                                break;
                                break;

-                       case '?':

                        default:
                                printf("Args are:\n"
                                       "\t-d\tDetach from terminal\n"
                        default:
                                printf("Args are:\n"
                                       "\t-d\tDetach from terminal\n"


@@ -2899,27 +2979,28 @@ int main(int argc, char *argv[])
 
        // Start the timer routine off
        time(&time_now);
 
        // Start the timer routine off
        time(&time_now);

-       strftime(time_now_string, 64, "%Y-%m-%d %H:%M:%S", localtime(&time_now));
+       strftime(time_now_string, sizeof(time_now_string), "%Y-%m-%d %H:%M:%S", localtime(&time_now));

        signal(SIGALRM, sigalrm_handler);
        siginterrupt(SIGALRM, 0);
 
        initiptables();
        initplugins();
        signal(SIGALRM, sigalrm_handler);
        siginterrupt(SIGALRM, 0);
 
        initiptables();
        initplugins();

-       initdata();
-       init_tbf();
-       init_cli();
+       initdata(optdebug, optconfig);
+
+       init_cli(hostname);

        read_config_file();
        read_config_file();

+       init_tbf(config->num_tbfs);

 
 

-       log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
-       log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
-       log(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+       LOG(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
+       LOG(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
+       LOG(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");

        {
                struct rlimit rlim;
                rlim.rlim_cur = RLIM_INFINITY;
                rlim.rlim_max = RLIM_INFINITY;
                // Remove the maximum core size
                if (setrlimit(RLIMIT_CORE, &rlim) < 0)
        {
                struct rlimit rlim;
                rlim.rlim_cur = RLIM_INFINITY;
                rlim.rlim_max = RLIM_INFINITY;
                // Remove the maximum core size
                if (setrlimit(RLIMIT_CORE, &rlim) < 0)

-                       log(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
+                       LOG(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));

                // Make core dumps go to /tmp
                chdir("/tmp");
        }
                // Make core dumps go to /tmp
                chdir("/tmp");
        }


@@ -2932,18 +3013,18 @@ int main(int argc, char *argv[])
 
                if (get_nprocs() < 2)
                {
 
                if (get_nprocs() < 2)
                {

-                       log(0, 0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
+                       LOG(0, 0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");

                        config->scheduler_fifo = 0;
                }
                else
                {
                        if ((ret = sched_setscheduler(0, SCHED_FIFO, &params)) == 0)
                        {
                        config->scheduler_fifo = 0;
                }
                else
                {
                        if ((ret = sched_setscheduler(0, SCHED_FIFO, &params)) == 0)
                        {

-                               log(1, 0, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n");
+                               LOG(1, 0, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n");

                        }
                        else
                        {
                        }
                        else
                        {

-                               log(0, 0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
+                               LOG(0, 0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));

                                config->scheduler_fifo = 0;
                        }
                }
                                config->scheduler_fifo = 0;
                        }
                }


@@ -2957,17 +3038,17 @@ int main(int argc, char *argv[])
        signal(SIGPIPE, SIG_IGN);
        bgp_setup(config->as_number);
        bgp_add_route(config->bind_address, 0xffffffff);
        signal(SIGPIPE, SIG_IGN);
        bgp_setup(config->as_number);
        bgp_add_route(config->bind_address, 0xffffffff);

-        if (*config->bgp_peer[0])
+       if (*config->bgp_peer[0])

                bgp_start(&bgp_peers[0], config->bgp_peer[0],
                    config->bgp_peer_as[0], 0); /* 0 = routing disabled */
 
                bgp_start(&bgp_peers[0], config->bgp_peer[0],
                    config->bgp_peer_as[0], 0); /* 0 = routing disabled */
 

-        if (*config->bgp_peer[1])
+       if (*config->bgp_peer[1])

                bgp_start(&bgp_peers[1], config->bgp_peer[1],
                    config->bgp_peer_as[1], 0);
 #endif /* BGP */
 
                bgp_start(&bgp_peers[1], config->bgp_peer[1],
                    config->bgp_peer_as[1], 0);
 #endif /* BGP */
 

-       inittap();
-       log(1, 0, 0, 0, "Set up on interface %s\n", config->tapdevice);
+       inittun();
+       LOG(1, 0, 0, 0, "Set up on interface %s\n", config->tundevice);

 
        initudp();
        initrad();
 
        initudp();
        initrad();


@@ -2981,6 +3062,15 @@ int main(int argc, char *argv[])
        signal(SIGQUIT, sigquit_handler);
        signal(SIGCHLD, sigchild_handler);
 
        signal(SIGQUIT, sigquit_handler);
        signal(SIGCHLD, sigchild_handler);
 

+       // Prevent us from getting paged out
+       if (config->lock_pages)
+       {
+               if (!mlockall(MCL_CURRENT))
+                       LOG(1, 0, 0, 0, "Locking pages into memory\n");
+               else
+                       LOG(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
+       }
+

        alarm(1);
 
        // Drop privileges here
        alarm(1);
 
        // Drop privileges here


@@ -3003,6 +3093,10 @@ int main(int argc, char *argv[])
        /* remove plugins (so cleanup code gets run) */
        plugins_done();
 
        /* remove plugins (so cleanup code gets run) */
        plugins_done();
 

+       // Remove the PID file if we wrote it
+       if (config->wrote_pid && *config->pid_file == '/')
+               unlink(config->pid_file);
+

        /* kill CLI children */
        signal(SIGTERM, SIG_IGN);
        kill(0, SIGTERM);
        /* kill CLI children */
        signal(SIGTERM, SIG_IGN);
        kill(0, SIGTERM);


@@ -3042,7 +3136,7 @@ void sigalrm_handler(int junk)
 
        // Update the internal time counter
        time(&time_now);
 
        // Update the internal time counter
        time(&time_now);

-       strftime(time_now_string, 64, "%Y-%m-%d %H:%M:%S", localtime(&time_now));
+       strftime(time_now_string, sizeof(time_now_string), "%Y-%m-%d %H:%M:%S", localtime(&time_now));

        alarm(1);
 
        {
        alarm(1);
 
        {


@@ -3055,7 +3149,7 @@ void sigalrm_handler(int junk)
 
 void sigterm_handler(int junk)
 {
 
 void sigterm_handler(int junk)
 {

-       log(1, 0, 0, 0, "Shutting down cleanly\n");
+       LOG(1, 0, 0, 0, "Shutting down cleanly\n");

        if (config->save_state)
                dump_state();
 
        if (config->save_state)
                dump_state();
 


@@ -3066,7 +3160,7 @@ void sigquit_handler(int junk)
 {
        int i;
 
 {
        int i;
 

-       log(1, 0, 0, 0, "Shutting down without saving sessions\n");
+       LOG(1, 0, 0, 0, "Shutting down without saving sessions\n");

        for (i = 1; i < MAXSESSION; i++)
        {
                if (session[i].opened)
        for (i = 1; i < MAXSESSION; i++)
        {
                if (session[i].opened)


@@ -3089,168 +3183,178 @@ void sigchild_handler(int signal)
 
 void read_state()
 {
 
 void read_state()
 {

-    struct stat sb;
-    int i;
-    ippoolt itmp;
-    FILE *f;
-    char magic[sizeof(DUMP_MAGIC)-1];
-    u32 buf[2];
+       struct stat sb;
+       int i;
+       ippoolt itmp;
+       FILE *f;
+       char magic[sizeof(DUMP_MAGIC) - 1];
+       u32 buf[2];

 
 

-    if (!config->save_state)
-    {
-       unlink(STATEFILE);
-       return;
-    }
+       if (!config->save_state)
+       {
+               unlink(STATEFILE);
+               return ;
+       }

 
 

-    if (stat(STATEFILE, &sb) < 0)
-    {
-       unlink(STATEFILE);
-       return;
-    }
+       if (stat(STATEFILE, &sb) < 0)
+       {
+               unlink(STATEFILE);
+               return ;
+       }

 
 

-    if (sb.st_mtime < (time(NULL) - 60))
-    {
-       log(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+       if (sb.st_mtime < (time(NULL) - 60))
+       {
+               LOG(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+               unlink(STATEFILE);
+               return ;
+       }
+
+       f = fopen(STATEFILE, "r");

        unlink(STATEFILE);
        unlink(STATEFILE);

-       return;
-    }
-
-    f = fopen(STATEFILE, "r");
-    unlink(STATEFILE);
-
-    if (!f)
-    {
-       log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
-       exit(1);
-    }
-
-    if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
-    {
-       log(0, 0, 0, 0, "Bad state file magic\n");
-       exit(1);
-    }
-
-    log(1, 0, 0, 0, "Reading state information\n");
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
-    {
-       log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
-       exit(1);
-    }
-
-    if (buf[0] > ip_pool_size)
-    {
-       log(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
-       exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
-    for (i = 0; i < buf[0]; i++)
-    {
-       if (fread(&itmp, sizeof(itmp), 1, f) != 1)
-       {
-           log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
-           exit(1);
-       }
-
-       if (itmp.address != ip_address_pool[i].address)
-       {
-           log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
-           exit(1);
-       }
-
-       memcpy(&ip_address_pool[i], &itmp, sizeof(itmp));
-    }
-
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
-    {
-       log(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
-       exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
-    if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
-    {
-       log(0, 0, 0, 0, "Error reading tunnel data from state file\n");
-       exit(1);
-    }
-
-    for (i = 0; i < MAXTUNNEL; i++)
-    {
-       tunnel[i].controlc = 0;
-       tunnel[i].controls = NULL;
-       tunnel[i].controle = NULL;
-       if (*tunnel[i].hostname)
-           log(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
-    }
-
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
-    {
-       log(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
-       exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
-    if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
-    {
-       log(0, 0, 0, 0, "Error reading session data from state file\n");
-       exit(1);
-    }
-
-    for (i = 0; i < MAXSESSION; i++)
-    {
-       session[i].tbf_in = 0;
-       session[i].tbf_out = 0;
-       if (session[i].opened)
-       {
-           log(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
-           if (session[i].ip)
-               sessionsetup(session[i].tunnel, i);
-       }
-    }
-
-    fclose(f);
-    log(0, 0, 0, 0, "Loaded saved state information\n");
+
+       if (!f)
+       {
+               LOG(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
+               exit(1);
+       }
+
+       if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
+       {
+               LOG(0, 0, 0, 0, "Bad state file magic\n");
+               exit(1);
+       }
+
+       LOG(1, 0, 0, 0, "Reading state information\n");
+       if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
+       {
+               LOG(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
+               exit(1);
+       }
+
+       if (buf[0] > ip_pool_size)
+       {
+               LOG(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
+               exit(1);
+       }
+
+       LOG(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
+       for (i = 0; i < buf[0]; i++)
+       {
+               if (fread(&itmp, sizeof(itmp), 1, f) != 1)
+               {
+                       LOG(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
+                       exit(1);
+               }
+
+               if (itmp.address != ip_address_pool[i].address)
+               {
+                       LOG(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
+                       exit(1);
+               }
+
+               memcpy(&ip_address_pool[i], &itmp, sizeof(itmp));
+       }
+
+       if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
+       {
+               LOG(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
+               exit(1);
+       }
+
+       LOG(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
+       if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
+       {
+               LOG(0, 0, 0, 0, "Error reading tunnel data from state file\n");
+               exit(1);
+       }
+
+       for (i = 0; i < MAXTUNNEL; i++)
+       {
+               tunnel[i].controlc = 0;
+               tunnel[i].controls = NULL;
+               tunnel[i].controle = NULL;
+               if (*tunnel[i].hostname)
+                       LOG(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
+       }
+
+       if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
+       {
+               LOG(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
+               exit(1);
+       }
+
+       LOG(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
+       if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
+       {
+               LOG(0, 0, 0, 0, "Error reading session data from state file\n");
+               exit(1);
+       }
+
+       for (i = 0; i < MAXSESSION; i++)
+       {
+               session[i].tbf_in = 0;
+               session[i].tbf_out = 0;
+               if (session[i].opened)
+               {
+                       LOG(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
+                       if (session[i].ip)
+                               sessionsetup(session[i].tunnel, i);
+               }
+       }
+
+       fclose(f);
+       LOG(0, 0, 0, 0, "Loaded saved state information\n");

 }
 
 void dump_state()
 {
 }
 
 void dump_state()
 {

-    FILE *f;
-    u32 buf[2];
+       FILE *f;
+       u32 buf[2];

 
 

-    if (!config->save_state)
-       return;
+       if (!config->save_state)
+               return;

 
 

-    do {
-       if (!(f = fopen(STATEFILE, "w")))
-           break;
+       do
+       {
+               if (!(f = fopen(STATEFILE, "w")))
+                       break;

 
 

-       log(1, 0, 0, 0, "Dumping state information\n");
+               LOG(1, 0, 0, 0, "Dumping state information\n");

 
 

-       if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC)-1, 1, f) != 1) break;
+               if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
+                       break;

 
 

-       log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
-       buf[0] = ip_pool_size;
-       buf[1] = sizeof(ippoolt);
-       if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-       if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size) break;
+               LOG(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
+               buf[0] = ip_pool_size;
+               buf[1] = sizeof(ippoolt);
+               if (fwrite(buf, sizeof(buf), 1, f) != 1)
+                       break;
+               if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size)
+                       break;

 
 

-       log(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
-       buf[0] = MAXTUNNEL;
-       buf[1] = sizeof(tunnelt);
-       if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-       if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL) break;
+               LOG(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
+               buf[0] = MAXTUNNEL;
+               buf[1] = sizeof(tunnelt);
+               if (fwrite(buf, sizeof(buf), 1, f) != 1)
+                       break;
+               if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
+                       break;

 
 

-       log(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
-       buf[0] = MAXSESSION;
-       buf[1] = sizeof(sessiont);
-       if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-       if (fwrite(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION) break;
+               LOG(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
+               buf[0] = MAXSESSION;
+               buf[1] = sizeof(sessiont);
+               if (fwrite(buf, sizeof(buf), 1, f) != 1)
+                       break;
+               if (fwrite(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
+                       break;

 
 

-       if (fclose(f) == 0) return; // OK
-    } while (0);
+               if (fclose(f) == 0)
+                       return ; // OK
+       }
+       while (0);

 
 

-    log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
-    unlink(STATEFILE);
+       LOG(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
+       unlink(STATEFILE);

 }
 
 void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)
 }
 
 void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)


@@ -3260,11 +3364,11 @@ void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **ch
 
        if (!*config->l2tpsecret)
        {
 
        if (!*config->l2tpsecret)
        {

-               log(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
+               LOG(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");

                return;
        }
 
                return;
        }
 

-       log(4, 0, 0, 0, "   Building challenge response for CHAP request\n");
+       LOG(4, 0, 0, 0, "   Building challenge response for CHAP request\n");

 
        *challenge_response = (char *)calloc(17, 1);
 
 
        *challenge_response = (char *)calloc(17, 1);
 


@@ -3279,18 +3383,20 @@ void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **ch
 
 static int facility_value(char *name)
 {
 
 static int facility_value(char *name)
 {

-    int i;
-    for (i = 0; facilitynames[i].c_name; i++)
-    {
-       if (strcmp(facilitynames[i].c_name, name) == 0)
-           return facilitynames[i].c_val;
-    }
-    return 0;
+       int i;
+       for (i = 0; facilitynames[i].c_name; i++)
+       {
+               if (strcmp(facilitynames[i].c_name, name) == 0)
+                       return facilitynames[i].c_val;
+       }
+       return 0;

 }
 
 void update_config()
 {
        int i;
 }
 
 void update_config()
 {
        int i;

+       static int timeout = 0;
+       static int interval = 0;

 
        // Update logging
        closelog();
 
        // Update logging
        closelog();


@@ -3335,11 +3441,25 @@ void update_config()
        // Update radius
        config->numradiusservers = 0;
        for (i = 0; i < MAXRADSERVER; i++)
        // Update radius
        config->numradiusservers = 0;
        for (i = 0; i < MAXRADSERVER; i++)

-               if (config->radiusserver[i]) config->numradiusservers++;
+               if (config->radiusserver[i])
+               {
+                       config->numradiusservers++;
+                       // Set radius port: if not set, take the port from the
+                       // first radius server.  For the first radius server,
+                       // take the #defined default value from l2tpns.h
+
+                       // test twice, In case someone works with
+                       // a secondary radius server without defining
+                       // a primary one, this will work even then.
+                       if (i>0 && !config->radiusport[i])
+                               config->radiusport[i] = config->radiusport[i-1];
+                       if (!config->radiusport[i])
+                               config->radiusport[i] = RADPORT;
+               }

 
        if (!config->numradiusservers)
        {
 
        if (!config->numradiusservers)
        {

-               log(0, 0, 0, 0, "No RADIUS servers defined!\n");
+               LOG(0, 0, 0, 0, "No RADIUS servers defined!\n");

        }
 
        config->num_radfds = 2 << RADIUS_SHIFT;
        }
 
        config->num_radfds = 2 << RADIUS_SHIFT;


@@ -3373,6 +3493,42 @@ void update_config()
        if (!config->cluster_hb_timeout)
                config->cluster_hb_timeout = HB_TIMEOUT;        // 10 missed heartbeat triggers an election.
 
        if (!config->cluster_hb_timeout)
                config->cluster_hb_timeout = HB_TIMEOUT;        // 10 missed heartbeat triggers an election.
 

+       if (interval != config->cluster_hb_interval || timeout != config->cluster_hb_timeout)
+       {
+               // Paranoia:  cluster_check_master() treats 2 x interval + 1 sec as
+               // late, ensure we're sufficiently larger than that
+               int t = 4 * config->cluster_hb_interval + 11;
+
+               if (config->cluster_hb_timeout < t)
+               {
+                       LOG(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
+                       config->cluster_hb_timeout = t;
+               }
+
+               // Push timing changes to the slaves immediately if we're the master
+               if (config->cluster_iam_master)
+                       cluster_heartbeat();
+
+               interval = config->cluster_hb_interval;
+               timeout = config->cluster_hb_timeout;
+       }
+
+       // Write PID file
+       if (*config->pid_file == '/' && !config->wrote_pid)
+       {
+               FILE *f;
+               if ((f = fopen(config->pid_file, "w")))
+               {
+                       fprintf(f, "%d\n", getpid());
+                       fclose(f);
+                       config->wrote_pid = 1;
+               }
+               else
+               {
+                       LOG(0, 0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
+               }
+       }
+

        config->reload_config = 0;
 }
 
        config->reload_config = 0;
 }
 


@@ -3381,14 +3537,15 @@ void read_config_file()
        FILE *f;
 
        if (!config->config_file) return;
        FILE *f;
 
        if (!config->config_file) return;

-       if (!(f = fopen(config->config_file, "r"))) {
+       if (!(f = fopen(config->config_file, "r")))
+       {

                fprintf(stderr, "Can't open config file %s: %s\n", config->config_file, strerror(errno));
                return;
        }
 
                fprintf(stderr, "Can't open config file %s: %s\n", config->config_file, strerror(errno));
                return;
        }
 

-       log(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
+       LOG(3, 0, 0, 0, "Reading config file %s\n", config->config_file);

        cli_do_file(f);
        cli_do_file(f);

-       log(3, 0, 0, 0, "Done reading config file\n");
+       LOG(3, 0, 0, 0, "Done reading config file\n");

        fclose(f);
        update_config();
 }
        fclose(f);
        update_config();
 }


@@ -3403,17 +3560,19 @@ int sessionsetup(tunnelidt t, sessionidt s)
 
        CSTAT(call_sessionsetup);
 
 
        CSTAT(call_sessionsetup);
 

-
-       log(3, session[s].ip, s, t, "Doing session setup for session\n");
+       LOG(3, session[s].ip, s, t, "Doing session setup for session\n");

 
        if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
        {
                assign_ip_address(s);
 
        if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
        {
                assign_ip_address(s);

-               if (session[s].ip)
-                       log(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
-                                       inet_toa(htonl(session[s].ip)));
-               else
-                       log(0, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
+               if (!session[s].ip)
+               {
+                       LOG(0, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
+                       sessionshutdown(s, "No IP addresses available");
+                       return 0;
+               }
+               LOG(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
+                       inet_toa(htonl(session[s].ip)));

        }
 
 
        }
 
 


@@ -3448,10 +3607,12 @@ int sessionsetup(tunnelidt t, sessionidt s)
        for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                routeset(s, session[s].route[r].ip, session[s].route[r].mask, session[s].ip, 1);
 
        for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                routeset(s, session[s].route[r].ip, session[s].route[r].mask, session[s].ip, 1);
 

-       if (!session[s].sid) {  // did this session just finish radius?
-               log(3, session[s].ip, s, t, "Sending initial IPCP to client\n");
+       if (!session[s].unique_id)
+       {
+               // did this session just finish radius?
+               LOG(3, session[s].ip, s, t, "Sending initial IPCP to client\n");

                sendipcp(t, s);
                sendipcp(t, s);

-               session[s].sid = ++last_sid;
+               session[s].unique_id = ++last_id;

        }
 
        // Run the plugin's against this new session.
        }
 
        // Run the plugin's against this new session.


@@ -3460,10 +3621,9 @@ int sessionsetup(tunnelidt t, sessionidt s)
                run_plugins(PLUGIN_NEW_SESSION, &data);
        }
 
                run_plugins(PLUGIN_NEW_SESSION, &data);
        }
 

-       // Force throttling on or off (Actually : refresh the current throttling status)
-       // This has the advantage of cleaning up after another throttled user who may have left
-       // firewall rules lying around
-       throttle_session(s, session[s].throttle);
+       // Allocate TBFs if throttled
+       if (session[s].throttle_in || session[s].throttle_out)
+               throttle_session(s, session[s].throttle_in, session[s].throttle_out);

 
        session[s].last_packet = time_now;
 
 
        session[s].last_packet = time_now;
 


@@ -3471,7 +3631,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
                char *sessionip, *tunnelip;
                sessionip = strdup(inet_toa(htonl(session[s].ip)));
                tunnelip = strdup(inet_toa(htonl(tunnel[t].ip)));
                char *sessionip, *tunnelip;
                sessionip = strdup(inet_toa(htonl(session[s].ip)));
                tunnelip = strdup(inet_toa(htonl(tunnel[t].ip)));

-               log(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
+               LOG(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",

                                session[s].user, sessionip, tunnelip, tunnel[t].hostname);
                if (sessionip) free(sessionip);
                if (tunnelip) free(tunnelip);
                                session[s].user, sessionip, tunnelip, tunnel[t].hostname);
                if (sessionip) free(sessionip);
                if (tunnelip) free(tunnelip);


@@ -3492,8 +3652,9 @@ int load_session(sessionidt s, sessiont *new)
 
                // Sanity checks.
        if (new->ip_pool_index >= MAXIPPOOL ||
 
                // Sanity checks.
        if (new->ip_pool_index >= MAXIPPOOL ||

-               new->tunnel >= MAXTUNNEL) {
-               log(0,0,s,0, "Strange session update received!\n");
+               new->tunnel >= MAXTUNNEL)
+       {
+               LOG(0,0,s,0, "Strange session update received!\n");

                        // FIXME! What to do here?
                return 0;
        }
                        // FIXME! What to do here?
                return 0;
        }


@@ -3523,7 +3684,9 @@ int load_session(sessionidt s, sessiont *new)
                                uncache_ipmap(session[s].ip);
                }
 
                                uncache_ipmap(session[s].ip);
                }
 

-               if (new->ip) {          // If there's a new one, add it.
+               if (new->ip)
+               {
+                       // If there's a new one, add it.

                        if (new->ip_pool_index == -1)
                                routeset(s, new->ip, 0, 0, 1);
                        else
                        if (new->ip_pool_index == -1)
                                routeset(s, new->ip, 0, 0, 1);
                        else


@@ -3549,6 +3712,12 @@ int load_session(sessionidt s, sessiont *new)
                                        // for walking the sessions to forward byte counts to the master.
                config->cluster_highest_sessionid = s;
 
                                        // for walking the sessions to forward byte counts to the master.
                config->cluster_highest_sessionid = s;
 

+       // TEMP: old session struct used a u32 to define the throttle
+       // speed for both up/down, new uses a u16 for each.  Deal with
+       // sessions from an old master for migration.
+       if (new->throttle_out == 0 && new->tbf_out)
+               new->throttle_out = new->throttle_in;
+

        memcpy(&session[s], new, sizeof(session[s]));   // Copy over..
 
                // Do fixups into address pool.
        memcpy(&session[s], new, sizeof(session[s]));   // Copy over..
 
                // Do fixups into address pool.


@@ -3588,7 +3757,7 @@ static void *open_plugin(char *plugin_name, int load)
        char path[256] = "";
 
        snprintf(path, 256, PLUGINDIR "/%s.so", plugin_name);
        char path[256] = "";
 
        snprintf(path, 256, PLUGINDIR "/%s.so", plugin_name);

-       log(2, 0, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);
+       LOG(2, 0, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);

        return dlopen(path, RTLD_NOW);
 }
 
        return dlopen(path, RTLD_NOW);
 }
 


@@ -3612,7 +3781,7 @@ void add_plugin(char *plugin_name)
 
        if (!p)
        {
 
        if (!p)
        {

-               log(1, 0, 0, 0, "   Plugin load failed: %s\n", dlerror());
+               LOG(1, 0, 0, 0, "   Plugin load failed: %s\n", dlerror());

                return;
        }
 
                return;
        }
 


@@ -3626,7 +3795,7 @@ void add_plugin(char *plugin_name)
                int *v = dlsym(p, "__plugin_api_version");
                if (!v || *v != PLUGIN_API_VERSION)
                {
                int *v = dlsym(p, "__plugin_api_version");
                if (!v || *v != PLUGIN_API_VERSION)
                {

-                       log(1, 0, 0, 0, "   Plugin load failed: API version mismatch: %s\n", dlerror());
+                       LOG(1, 0, 0, 0, "   Plugin load failed: API version mismatch: %s\n", dlerror());

                        dlclose(p);
                        return;
                }
                        dlclose(p);
                        return;
                }


@@ -3636,7 +3805,7 @@ void add_plugin(char *plugin_name)
        {
                if (!initfunc(&funcs))
                {
        {
                if (!initfunc(&funcs))
                {

-                       log(1, 0, 0, 0, "   Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
+                       LOG(1, 0, 0, 0, "   Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());

                        dlclose(p);
                        return;
                }
                        dlclose(p);
                        return;
                }


@@ -3649,12 +3818,12 @@ void add_plugin(char *plugin_name)
                void *x;
                if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
                {
                void *x;
                if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
                {

-                       log(3, 0, 0, 0, "   Supports function \"%s\"\n", plugin_functions[i]);
+                       LOG(3, 0, 0, 0, "   Supports function \"%s\"\n", plugin_functions[i]);

                        ll_push(plugins[i], x);
                }
        }
 
                        ll_push(plugins[i], x);
                }
        }
 

-       log(2, 0, 0, 0, "   Loaded plugin %s\n", plugin_name);
+       LOG(2, 0, 0, 0, "   Loaded plugin %s\n", plugin_name);

 }
 
 static void run_plugin_done(void *plugin)
 }
 
 static void run_plugin_done(void *plugin)


@@ -3687,7 +3856,7 @@ void remove_plugin(char *plugin_name)
        }
 
        dlclose(p);
        }
 
        dlclose(p);

-       log(2, 0, 0, 0, "Removed plugin %s\n", plugin_name);
+       LOG(2, 0, 0, 0, "Removed plugin %s\n", plugin_name);

 }
 
 int run_plugins(int plugin_type, void *data)
 }
 
 int run_plugins(int plugin_type, void *data)


@@ -3724,7 +3893,7 @@ void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
 
        if (log_stream && config->debug >= 4)
        {
 
        if (log_stream && config->debug >= 4)
        {

-               log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
+               LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");

                dump_packet(buf, log_stream);
        }
 
                dump_packet(buf, log_stream);
        }
 


@@ -3744,7 +3913,7 @@ void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
        if (param.send_response)
        {
                send_packet(controlfd, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), param.response, param.response_length);
        if (param.send_response)
        {
                send_packet(controlfd, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), param.response, param.response_length);

-               log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");
+               LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");

        }
 
        free(resp);
        }
 
        free(resp);


@@ -3758,7 +3927,7 @@ void tunnel_clean()
 {
        int i;
 
 {
        int i;
 

-       log(1, 0, 0, 0, "Cleaning tunnels array\n");
+       LOG(1, 0, 0, 0, "Cleaning tunnels array\n");

 
        for (i = 1; i < MAXTUNNEL; i++)
        {
 
        for (i = 1; i < MAXTUNNEL; i++)
        {


@@ -3785,13 +3954,13 @@ tunnelidt new_tunnel()
        {
                if (tunnel[i].state == TUNNELFREE)
                {
        {
                if (tunnel[i].state == TUNNELFREE)
                {

-                       log(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
+                       LOG(4, 0, 0, i, "Assigning tunnel ID %d\n", i);

                        if (i > config->cluster_highest_tunnelid)
                                config->cluster_highest_tunnelid = i;
                        return i;
                }
        }
                        if (i > config->cluster_highest_tunnelid)
                                config->cluster_highest_tunnelid = i;
                        return i;
                }
        }

-       log(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
+       LOG(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");

        return 0;
 }
 
        return 0;
 }
 


@@ -3804,18 +3973,33 @@ tunnelidt new_tunnel()
 //
 void become_master(void)
 {
 //
 void become_master(void)
 {

-       int s;
+       int s, i;

        run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
        run_plugins(PLUGIN_BECOME_MASTER, NULL);
 

-       for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
-               if (!session[s].tunnel) // Not an in-use session.
-                       continue;
+       // running a bunch of iptables commands is slow and can cause
+       // the master to drop tunnels on takeover--kludge around the
+       // problem by forking for the moment (note: race)
+       if (!fork_and_close())
+       {
+               for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+               {
+                       if (!session[s].tunnel) // Not an in-use session.
+                               continue;

 
 

-               run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+                       run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+               }
+               exit(0);

        }
        }

-}
-

 
 

+       // add radius fds
+       for (i = 0; i < config->num_radfds; i++)
+       {
+               if (!radfds[i]) continue;
+               FD_SET(radfds[i], &readset);
+               if (radfds[i] > readset_n)
+                       readset_n = radfds[i];
+       }
+}

 
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc)
 {
 
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc)
 {


@@ -3829,7 +4013,8 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
        time(&time_now);
        for (i = 0; i < 64;++i) buckets[i] = 0;
 
        time(&time_now);
        for (i = 0; i < 64;++i) buckets[i] = 0;
 

-       for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+       for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+       {

                int idle;
                if (!session[s].tunnel)
                        continue;
                int idle;
                if (!session[s].tunnel)
                        continue;


@@ -3845,7 +4030,8 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
                ++buckets[idle];
        }
 
                ++buckets[idle];
        }
 

-       for (i = 0; i < 63; ++i) {
+       for (i = 0; i < 63; ++i)
+       {

                cli_print(cli, "%3d seconds  : %7.2f%% (%6d)", i * 5, (double) buckets[i] * 100.0 / count , buckets[i]);
        }
        cli_print(cli, "lots of secs : %7.2f%% (%6d)", (double) buckets[63] * 100.0 / count , buckets[i]);
                cli_print(cli, "%3d seconds  : %7.2f%% (%6d)", i * 5, (double) buckets[i] * 100.0 / count , buckets[i]);
        }
        cli_print(cli, "lots of secs : %7.2f%% (%6d)", (double) buckets[63] * 100.0 / count , buckets[i]);


@@ -3865,7 +4051,8 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
        time(&time_now);
        for (i = 0; i < 64;++i) buckets[i] = 0;
 
        time(&time_now);
        for (i = 0; i < 64;++i) buckets[i] = 0;
 

-       for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+       for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+       {

                int open = 0, d;
                if (!session[s].tunnel)
                        continue;
                int open = 0, d;
                if (!session[s].tunnel)
                        continue;


@@ -3873,7 +4060,8 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
                d = time_now - session[s].opened;
                if (d < 0)
                        d = 0;
                d = time_now - session[s].opened;
                if (d < 0)
                        d = 0;

-               while (d > 1 && open < 32) {
+               while (d > 1 && open < 32)
+               {

                        ++open;
                        d >>= 1; // half.
                }
                        ++open;
                        d >>= 1; // half.
                }


@@ -3882,10 +4070,85 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
        }
 
        s = 1;
        }
 
        s = 1;

-       for (i = 0; i  < 30; ++i) {
+       for (i = 0; i  < 30; ++i)
+       {

                cli_print(cli, " < %8d seconds : %7.2f%% (%6d)", s, (double) buckets[i] * 100.0 / count , buckets[i]);
                s <<= 1;
        }
        cli_print(cli, "%d total sessions open.", count);
        return CLI_OK;
 }
                cli_print(cli, " < %8d seconds : %7.2f%% (%6d)", s, (double) buckets[i] * 100.0 / count , buckets[i]);
                s <<= 1;
        }
        cli_print(cli, "%d total sessions open.", count);
        return CLI_OK;
 }

+
+/* Unhide an avp.
+ *
+ * This unencodes the AVP using the L2TP CHAP secret and the
+ * previously stored random vector. It replaces the hidden data with
+ * the cleartext data and returns the length of the cleartext data
+ * (including the AVP "header" of 6 bytes).
+ *
+ * Based on code from rp-l2tpd by Roaring Penguin Software Inc.
+ */
+int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length)
+{
+       MD5_CTX ctx;
+       u8 *cursor;
+       u8 digest[16];
+       u8 working_vector[16];
+       uint16_t hidden_length;
+       u8 type[2];
+       size_t done, todo;
+       u8 *output;
+
+       // Find the AVP type.
+       type[0] = *(avp + 4);
+       type[1] = *(avp + 5);
+
+       // Line up with the hidden data
+       cursor = output = avp + 6;
+
+       // Compute initial pad
+       MD5Init(&ctx);
+       MD5Update(&ctx, type, 2);
+       MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
+       MD5Update(&ctx, session[s].random_vector, session[s].random_vector_length);
+       MD5Final(digest, &ctx);
+
+       // Get hidden length
+       hidden_length = ((uint16_t) (digest[0] ^ cursor[0])) * 256 + (uint16_t) (digest[1] ^ cursor[1]);
+
+       // Keep these for later use
+       working_vector[0] = *cursor;
+       working_vector[1] = *(cursor + 1);
+       cursor += 2;
+
+       if (hidden_length > length - 8)
+       {
+               LOG(1, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
+               return 0;
+       }
+
+       /* Decrypt remainder */
+       done = 2;
+       todo = hidden_length;
+       while (todo)
+       {
+               working_vector[done] = *cursor;
+               *output = digest[done] ^ *cursor;
+               ++output;
+               ++cursor;
+               --todo;
+               ++done;
+               if (done == 16 && todo)
+               {
+                       // Compute new digest
+                       done = 0;
+                       MD5Init(&ctx);
+                       MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
+                       MD5Update(&ctx, &working_vector, 16);
+                       MD5Final(digest, &ctx);
+               }
+       }
+
+       return hidden_length + 6;
+}
+