continue, not return

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 51aec99..de3929d 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.15 2004/07/12 15:16:27 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.56 2004/11/25 02:49:18 bodea Exp $";

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


@@ -23,6 +23,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.15 2004/07/12 15:16:27 bodea Exp
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.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>


@@ -48,63 +49,66 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.15 2004/07/12 15:16:27 bodea Exp
 #include "util.h"
 #include "tbf.h"
 
 #include "util.h"
 #include "tbf.h"
 

+#ifdef BGP
+#include "bgp.h"
+#endif /* BGP */
+

 // Globals
 struct configt *config = NULL; // all configuration
 int tunfd = -1;                        // tun interface file handle. (network device)
 int udpfd = -1;                        // UDP file handle
 int controlfd = -1;            // Control signal handle
 // Globals
 struct configt *config = NULL; // all configuration
 int tunfd = -1;                        // tun interface file handle. (network device)
 int udpfd = -1;                        // UDP file handle
 int controlfd = -1;            // Control signal handle

+int clifd = -1;                        // Socket listening for CLI connections.

 int snoopfd = -1;              // UDP file handle for sending out intercept data
 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 snoopfd = -1;              // UDP file handle for sending out intercept data
 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 tunidx;                    // ifr_ifindex of tun device
-u32 sessionid = 0;             // session id for radius accounting
-int syslog_log = 0;            // are we logging to syslog
-FILE *log_stream = NULL;       // file handle for direct logging (i.e. direct into file, not via syslog).
+static u32 sessionid = 0;      // session id for radius accounting
+static int syslog_log = 0;     // are we logging to syslog
+static 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.
 extern int cluster_sockfd;     // Intra-cluster communications socket.

-u32 last_sid = 0;              // Last used PPP SID. Can I kill this?? -- mo
-int clifd = 0;                 // Socket listening for CLI connections.
+u32 last_id = 0;               // Last used PPP SID. Can I kill this?? -- mo

 
 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.
 
 
 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 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;
+// Traffic counters.
+static u32 udp_rx = 0, udp_rx_pkt = 0, udp_tx = 0;
+static u32 eth_rx = 0, eth_rx_pkt = 0;
+u32 eth_tx = 0;
+
+static 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.
+static char time_now_string[64] = {0}; // Current time as a string.
+static char main_quit = 0;             // True if we're in the process of exiting.

 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 

-#ifdef BGP
-#include "bgp.h"
-struct bgp_peer *bgp_peers = 0;
-struct bgp_route_list *bgp_routes = 0;
-int bgp_configured = 0;
-#endif /* BGP */
-

 #define membersize(STRUCT, MEMBER) sizeof(((STRUCT *)0)->MEMBER)
 #define CONFIG(NAME, MEMBER, TYPE) { NAME, offsetof(struct configt, MEMBER), membersize(struct configt, MEMBER), TYPE }
 
 struct config_descriptt config_values[] = {
        CONFIG("debug", debug, INT),
        CONFIG("log_file", log_filename, STRING),
 #define membersize(STRUCT, MEMBER) sizeof(((STRUCT *)0)->MEMBER)
 #define CONFIG(NAME, MEMBER, TYPE) { NAME, offsetof(struct configt, MEMBER), membersize(struct configt, MEMBER), TYPE }
 
 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("accounting_dir", accounting_dir, STRING),
        CONFIG("setuid", target_uid, INT),
        CONFIG("dump_speed", dump_speed, BOOL),


@@ -117,17 +121,10 @@ struct config_descriptt config_values[] = {
        CONFIG("cluster_interface", cluster_interface, STRING),
        CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
        CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
        CONFIG("cluster_interface", cluster_interface, STRING),
        CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
        CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),

-#ifdef BGP
-       CONFIG("as_number", as_number, SHORT),
-       CONFIG("bgp_peer1", bgp_peer[0], STRING),
-       CONFIG("bgp_peer1_as", bgp_peer_as[0], SHORT),
-       CONFIG("bgp_peer2", bgp_peer[1], STRING),
-       CONFIG("bgp_peer2_as", bgp_peer_as[1], SHORT),
-#endif /* BGP */

        { NULL, 0, 0, 0 },
 };
 
        { NULL, 0, 0, 0 },
 };
 

-char *plugin_functions[] = {
+static char *plugin_functions[] = {

        NULL,
        "plugin_pre_auth",
        "plugin_post_auth",
        NULL,
        "plugin_pre_auth",
        "plugin_post_auth",


@@ -149,29 +146,36 @@ 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.
 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;
+static controlt *controlfree = 0;

 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 

-void sigalrm_handler(int);
-void sighup_handler(int);
-void sigterm_handler(int);
-void sigquit_handler(int);
-void sigchild_handler(int);
-void read_config_file();
-void read_state();
-void dump_state();
-void tunnel_clean();
-tunnelidt new_tunnel();
-void update_config();
-

 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);

+static void free_ip_address(sessionidt s);
+static void dump_acct_info(void);
+static void sighup_handler(int sig);
+static void sigalrm_handler(int sig);
+static void sigterm_handler(int sig);
+static void sigquit_handler(int sig);
+static void sigchild_handler(int sig);
+static void read_state(void);
+static void dump_state(void);
+static void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response);
+static void update_config(void);
+static void read_config_file(void);
+static void initplugins(void);
+static int add_plugin(char *plugin_name);
+static int remove_plugin(char *plugin_name);
+static void plugins_done(void);
+static void processcontrol(u8 * buf, int len, struct sockaddr_in *addr, int alen);
+static tunnelidt new_tunnel(void);
+static int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length);

 
 // return internal time (10ths since process startup)
 
 // return internal time (10ths since process startup)

-clockt now(void)
+static clockt now(void)

 {
        struct timeval t;
        gettimeofday(&t, 0);
 {
        struct timeval t;
        gettimeofday(&t, 0);


@@ -189,7 +193,7 @@ clockt backoff(u8 try)
 
 
 //
 
 
 //

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

 //
 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {
 //
 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {


@@ -234,17 +238,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; )


@@ -289,12 +293,12 @@ void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *tit
 // Add a route
 //
 // This adds it to the routing table, advertises it
 // Add a route
 //
 // This adds it to the routing table, advertises it

-// via iBGP if enabled, and stuffs it into the
+// via BGP if enabled, and stuffs it into the

 // 'sessionbyip' cache.
 //
 // 'ip' and 'mask' must be in _host_ order.
 //
 // 'sessionbyip' cache.
 //
 // 'ip' and 'mask' must be in _host_ order.
 //

-void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
+static void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)

 {
        struct rtentry r;
        int i;
 {
        struct rtentry r;
        int i;


@@ -317,14 +321,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)


@@ -334,7 +338,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 #endif /* BGP */
 
                // Add/Remove the IPs to the 'sessionbyip' cache.
 #endif /* BGP */
 
                // Add/Remove the IPs to the 'sessionbyip' cache.

-               // Note that we add the zero address in the case of 
+               // Note that we add the zero address in the case of

                // a network route. Roll on CIDR.
 
                // Note that 's == 0' implies this is the address pool.
                // a network route. Roll on CIDR.
 
                // Note that 's == 0' implies this is the address pool.


@@ -353,7 +357,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 
 //
 // Set up TUN interface
 
 //
 // Set up TUN interface

-void inittun(void)
+static void inittun(void)

 {
        struct ifreq ifr;
        struct sockaddr_in sin = {0};
 {
        struct ifreq ifr;
        struct sockaddr_in sin = {0};


@@ -363,7 +367,7 @@ void inittun(void)
        tunfd = open(TUNDEVICE, O_RDWR);
        if (tunfd < 0)
        {                          // fatal
        tunfd = open(TUNDEVICE, O_RDWR);
        if (tunfd < 0)
        {                          // fatal

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

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


@@ -372,7 +376,7 @@ void inittun(void)
        }
        if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
        {
        }
        if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
        {

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

                exit(1);
        }
        assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
                exit(1);
        }
        assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));


@@ -385,32 +389,26 @@ void inittun(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, SIOCGIFINDEX, (void *) &ifr) < 0)
-       {
-               log(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
-               exit(1);
-       }
-       tunidx = ifr.ifr_ifindex;

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

-void initudp(void)
+static void initudp(void)

 {
        int on = 1;
        struct sockaddr_in addr;
 {
        int on = 1;
        struct sockaddr_in addr;


@@ -428,7 +426,7 @@ 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);
        }
        snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
                exit(1);
        }
        snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);


@@ -436,12 +434,12 @@ void initudp(void)
        // Control
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        // Control
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;

-       addr.sin_port = htons(1702);
-       controlfd = socket(AF_INET, SOCK_DGRAM, 17);
+       addr.sin_port = htons(NSCTL_PORT);
+       controlfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

        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);
        }
 }


@@ -461,7 +459,7 @@ void initudp(void)
 // IP address.
 //
 
 // IP address.
 //
 

-int lookup_ipmap(ipt ip)
+static int lookup_ipmap(ipt ip)

 {
        u8 *a = (u8 *)&ip;
        char **d = (char **) ip_hash;
 {
        u8 *a = (u8 *)&ip;
        char **d = (char **) ip_hash;


@@ -512,9 +510,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.
 }
 


@@ -535,20 +533,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;
                                }
                        }


@@ -570,7 +576,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.
 


@@ -590,21 +597,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;
        }


@@ -613,13 +620,13 @@ void send_garp(ipt ip)
 }
 
 // Find session by username, 0 for not found
 }
 
 // Find session by username, 0 for not found

-sessiont *sessiontbysessionidt(sessionidt s)
+static sessiont *sessiontbysessionidt(sessionidt s)

 {
        if (!s || s > MAXSESSION) return NULL;
        return &session[s];
 }
 
 {
        if (!s || s > MAXSESSION) return NULL;
        return &session[s];
 }
 

-sessionidt sessionidtbysessiont(sessiont *s)
+static sessionidt sessionidtbysessiont(sessiont *s)

 {
        sessionidt val = s-session;
        if (s < session || val > MAXSESSION) return 0;
 {
        sessionidt val = s-session;
        if (s < session || val > MAXSESSION) return 0;


@@ -636,7 +643,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;


@@ -645,11 +652,12 @@ 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;
        }

+

        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        *(u32 *) & addr.sin_addr = htonl(tunnel[t].ip);
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        *(u32 *) & addr.sin_addr = htonl(tunnel[t].ip);


@@ -666,19 +674,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);
 }


@@ -694,7 +702,7 @@ int tun_write(u8 * data, int size)
 
 // process outgoing (to tunnel) IP
 //
 
 // process outgoing (to tunnel) IP
 //

-void processipout(u8 * buf, int len)
+static void processipout(u8 * buf, int len)

 {
        sessionidt s;
        sessiont *sp;
 {
        sessionidt s;
        sessiont *sp;


@@ -710,13 +718,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;
        }


@@ -728,7 +736,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;
        }
 


@@ -739,14 +747,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;


@@ -770,22 +779,19 @@ 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");
-                       return;
-               }
+               if (!p) return;

                tunnelsend(b, len + (p-b), t); // send it...
        }
 
                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++;


@@ -797,7 +803,7 @@ void processipout(u8 * buf, int len)
 // Helper routine for the TBF filters.
 // Used to send queued data in to the user!
 //
 // Helper routine for the TBF filters.
 // Used to send queued data in to the user!
 //

-void send_ipout(sessionidt s, u8 *buf, int len)
+static void send_ipout(sessionidt s, u8 *buf, int len)

 {
        sessiont *sp;
        tunnelidt t;
 {
        sessiont *sp;
        tunnelidt t;


@@ -805,8 +811,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;
        }
 


@@ -818,24 +825,23 @@ 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.
-       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");
-                       return;
-               }
+               if (!p) return;

                tunnelsend(b, len + (p-b), t); // send it...
        }
                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++;


@@ -844,7 +850,7 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 }
 
 // add an AVP (16 bit)
 }
 
 // add an AVP (16 bit)

-void control16(controlt * c, u16 avp, u16 val, u8 m)
+static void control16(controlt * c, u16 avp, u16 val, u8 m)

 {
        u16 l = (m ? 0x8008 : 0x0008);
        *(u16 *) (c->buf + c->length + 0) = htons(l);
 {
        u16 l = (m ? 0x8008 : 0x0008);
        *(u16 *) (c->buf + c->length + 0) = htons(l);


@@ -855,7 +861,7 @@ void control16(controlt * c, u16 avp, u16 val, u8 m)
 }
 
 // add an AVP (32 bit)
 }
 
 // add an AVP (32 bit)

-void control32(controlt * c, u16 avp, u32 val, u8 m)
+static void control32(controlt * c, u16 avp, u32 val, u8 m)

 {
        u16 l = (m ? 0x800A : 0x000A);
        *(u16 *) (c->buf + c->length + 0) = htons(l);
 {
        u16 l = (m ? 0x800A : 0x000A);
        *(u16 *) (c->buf + c->length + 0) = htons(l);


@@ -866,7 +872,7 @@ void control32(controlt * c, u16 avp, u32 val, u8 m)
 }
 
 // add an AVP (32 bit)
 }
 
 // add an AVP (32 bit)

-void controls(controlt * c, u16 avp, char *val, u8 m)
+static void controls(controlt * c, u16 avp, char *val, u8 m)

 {
        u16 l = ((m ? 0x8000 : 0) + strlen(val) + 6);
        *(u16 *) (c->buf + c->length + 0) = htons(l);
 {
        u16 l = ((m ? 0x8000 : 0) + strlen(val) + 6);
        *(u16 *) (c->buf + c->length + 0) = htons(l);


@@ -877,7 +883,7 @@ void controls(controlt * c, u16 avp, char *val, u8 m)
 }
 
 // add a binary AVP
 }
 
 // add a binary AVP

-void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
+static void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)

 {
        u16 l = ((m ? 0x8000 : 0) + len + 6);
        *(u16 *) (c->buf + c->length + 0) = htons(l);
 {
        u16 l = ((m ? 0x8000 : 0) + len + 6);
        *(u16 *) (c->buf + c->length + 0) = htons(l);


@@ -888,7 +894,7 @@ void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
 }
 
 // new control connection
 }
 
 // new control connection

-controlt *controlnew(u16 mtype)
+static controlt *controlnew(u16 mtype)

 {
        controlt *c;
        if (!controlfree)
 {
        controlt *c;
        if (!controlfree)


@@ -908,7 +914,7 @@ controlt *controlnew(u16 mtype)
 
 // send zero block if nothing is waiting
 // (ZLB send).
 
 // send zero block if nothing is waiting
 // (ZLB send).

-void controlnull(tunnelidt t)
+static void controlnull(tunnelidt t)

 {
        u8 buf[12];
        if (tunnel[t].controlc) // Messages queued; They will carry the ack.
 {
        u8 buf[12];
        if (tunnel[t].controlc) // Messages queued; They will carry the ack.


@@ -924,7 +930,7 @@ void controlnull(tunnelidt t)
 }
 
 // add a control message to a tunnel, and send if within window
 }
 
 // add a control message to a tunnel, and send if within window

-void controladd(controlt * c, tunnelidt t, sessionidt s)
+static void controladd(controlt * c, tunnelidt t, sessionidt s)

 {
        *(u16 *) (c->buf + 2) = htons(c->length); // length
        *(u16 *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
 {
        *(u16 *) (c->buf + 2) = htons(c->length); // length
        *(u16 *) (c->buf + 4) = htons(tunnel[t].far); // tunnel


@@ -949,62 +955,53 @@ 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
-
-       if (throttle) {
-               if (session[s].tbf_in || session[s].tbf_out) {
-                       if (throttle == session[s].throttle)
-                               return 1;
+               return; // No-one home.

 
 

-                       // 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
 void sessionshutdown(sessionidt s, char *reason)
 {
 }
 
 // start tidy shutdown of session
 void sessionshutdown(sessionidt s, char *reason)
 {

-       int dead = session[s].die;

        int walled_garden = session[s].walled_garden;
 
 
        int walled_garden = session[s].walled_garden;
 
 


@@ -1012,28 +1009,26 @@ 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 (!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
-
+       if (!session[s].die)

        {
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
        {
                struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };

+               LOG(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);

                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 
        // RADIUS Stop message
                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 
        // RADIUS Stop message

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

                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


@@ -1050,29 +1045,39 @@ void sessionshutdown(sessionidt s, char *reason)
        if (session[s].ip)
        {                          // IP allocated, clear and unroute
                int r;
        if (session[s].ip)
        {                          // IP allocated, clear and unroute
                int r;

+               int routed = 0;

                for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
                {
                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, 0);
+                       if ((session[s].ip & session[s].route[r].mask) ==
+                           (session[s].route[r].ip & session[s].route[r].mask))
+                               routed++;
+
+                       routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);

                        session[s].route[r].ip = 0;
                }
 
                if (session[s].ip_pool_index == -1) // static ip
                {
                        session[s].route[r].ip = 0;
                }
 
                if (session[s].ip_pool_index == -1) // static ip
                {

-                       routeset(s, session[s].ip, 0, 0, 0);    // Delete route.
+                       if (!routed) routeset(s, session[s].ip, 0, 0, 0);

                        session[s].ip = 0;
                }
                else
                        free_ip_address(s);
                        session[s].ip = 0;
                }
                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
        }

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

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


@@ -1102,23 +1107,23 @@ void sendipcp(tunnelidt t, sessionidt s)
        }
 
        q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
        }
 
        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");
-               return;
-       }
+       if (!q) return;

 
        *q = ConfigReq;
        q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
        *(u16 *) (q + 2) = htons(10);
        q[4] = 3;
        q[5] = 6;
 
        *q = ConfigReq;
        q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
        *(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.
 }
 
 // kill a session now
        tunnelsend(buf, 10 + (q - buf), t); // send it
        session[s].flags &= ~SF_IPCP_ACKED;     // Clear flag.
 }
 
 // kill a session now

-void sessionkill(sessionidt s, char *reason)
+static void sessionkill(sessionidt s, char *reason)

 {
 
        CSTAT(call_sessionkill);
 {
 
        CSTAT(call_sessionkill);


@@ -1128,9 +1133,7 @@ void sessionkill(sessionidt s, char *reason)
        if (session[s].radius)
                radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
 
        if (session[s].radius)
                radiusclear(session[s].radius, s); // 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);
-
-       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.
 
        memset(&session[s], 0, sizeof(session[s]));
        session[s].tunnel = T_FREE;     // Mark it as free.


@@ -1140,8 +1143,15 @@ void sessionkill(sessionidt s, char *reason)
        cluster_send_session(s);
 }
 
        cluster_send_session(s);
 }
 

+static void tunnelclear(tunnelidt t)
+{
+       if (!t) return;
+       memset(&tunnel[t], 0, sizeof(tunnel[t]));
+       tunnel[t].state = TUNNELFREE;
+}
+

 // kill a tunnel now
 // kill a tunnel now

-void tunnelkill(tunnelidt t, char *reason)
+static void tunnelkill(tunnelidt t, char *reason)

 {
        sessionidt s;
        controlt *c;
 {
        sessionidt s;
        controlt *c;


@@ -1166,13 +1176,13 @@ 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);
+       LOG(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);

        cli_tunnel_actions[s].action = 0;
        cluster_send_tunnel(t);
 }
 
 // shut down a tunnel cleanly
        cli_tunnel_actions[s].action = 0;
        cluster_send_tunnel(t);
 }
 
 // shut down a tunnel cleanly

-void tunnelshutdown(tunnelidt t, char *reason)
+static void tunnelshutdown(tunnelidt t, char *reason)

 {
        sessionidt s;
 
 {
        sessionidt s;
 


@@ -1184,12 +1194,12 @@ 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++)
                if (session[s].tunnel == t)
 
        // close session
        for (s = 1; s < MAXSESSION; s++)
                if (session[s].tunnel == t)

-                       sessionkill(s, reason);
+                       sessionshutdown(s, reason);

 
        tunnel[t].state = TUNNELDIE;
        tunnel[t].die = now() + 700; // Clean up in 70 seconds
 
        tunnel[t].state = TUNNELDIE;
        tunnel[t].die = now() + 700; // Clean up in 70 seconds


@@ -1215,18 +1225,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;
        }


@@ -1241,13 +1251,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;
        }


@@ -1265,7 +1275,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;
        }


@@ -1284,18 +1294,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)


@@ -1305,7 +1316,8 @@ 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) {
+                       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) )
                                if (tunnel[i].state != TUNNELOPENING ||
                                        tunnel[i].ip != ntohl(*(ipt *) & addr->sin_addr) ||
                                        tunnel[i].port != ntohs(addr->sin_port) )


@@ -1315,10 +1327,11 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                        }
                }
 
                        }
                }
 

-               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;
                        }


@@ -1326,7 +1339,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);
                }
 


@@ -1357,7 +1370,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?


@@ -1400,7 +1413,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;


@@ -1411,28 +1424,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
                                }


@@ -1441,12 +1461,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;


@@ -1454,26 +1474,30 @@ 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);
                                                }
                                                if (n > 4)
                                                                errcode, errdesc);
                                                }
                                                if (n > 4)

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

                                                                n-4, b+4);
 
                                                break;
                                                                n-4, b+4);
 
                                                break;


@@ -1482,10 +1506,10 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
                                case 2:     // protocol version
                                        {
                                                version = ntohs(*(u16 *) (b));
                                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


@@ -1493,69 +1517,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
                                        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);
                                        // TBA - to send to RADIUS
                                        break;
                                case 8:     // vendor name
                                        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);
+                                       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)


@@ -1569,7 +1600,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


@@ -1584,19 +1615,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;


@@ -1605,20 +1636,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;


@@ -1628,56 +1659,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
                                }


@@ -1745,7 +1760,7 @@ 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");
+                                                       LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");

                                                        sessionkill(s, "no free RADIUS sesions");
                                                        return;
                                                }
                                                        sessionkill(s, "no free RADIUS sesions");
                                                        return;
                                                }


@@ -1756,7 +1771,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
                                                {


@@ -1775,9 +1790,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)


@@ -1788,14 +1804,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);


@@ -1803,14 +1819,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;


@@ -1818,7 +1834,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;
                }


@@ -1844,7 +1860,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);


@@ -1853,7 +1869,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
                }


@@ -1889,41 +1905,26 @@ 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 tun
                }
        }
 }
 
 // read and process packet on tun

-void processtun(u8 * buf, int len)
+static void processtun(u8 * buf, int len)

 {
 {

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

        STAT(tun_rx_packets);
        INC_STAT(tun_rx_bytes, len);
 
        STAT(tun_rx_packets);
        INC_STAT(tun_rx_bytes, len);
 


@@ -1933,7 +1934,7 @@ void processtun(u8 * buf, int len)
        eth_rx += len;
        if (len < 22)
        {
        eth_rx += len;
        if (len < 22)
        {

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

                STAT(tun_rx_errors);
                return;
        }
                STAT(tun_rx_errors);
                return;
        }


@@ -1949,7 +1950,7 @@ void processtun(u8 * buf, int len)
 // at once.
 #define MAX_ACTIONS 500
 
 // at once.
 #define MAX_ACTIONS 500
 

-int regular_cleanups(void)
+static int regular_cleanups(void)

 {
        static sessionidt s = 0;        // Next session to check for actions on.
        tunnelidt t;
 {
        static sessionidt s = 0;        // Next session to check for actions on.
        tunnelidt t;


@@ -1958,7 +1959,7 @@ int regular_cleanups(void)
        static clockt next_acct = 0;
        int a;
 
        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++)
        {


@@ -2004,7 +2005,7 @@ 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 tunnel changes requested from the CLI
                }
 
                // Check for tunnel changes requested from the CLI


@@ -2013,7 +2014,7 @@ int regular_cleanups(void)
                        cli_tunnel_actions[t].action = 0;
                        if (a & CLI_TUN_KILL)
                        {
                        cli_tunnel_actions[t].action = 0;
                        if (a & CLI_TUN_KILL)
                        {

-                               log(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
+                               LOG(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");

                                tunnelshutdown(t, "Requested by administrator");
                        }
                }
                                tunnelshutdown(t, "Requested by administrator");
                        }
                }


@@ -2030,10 +2031,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);
                }
 


@@ -2060,21 +2061,17 @@ 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");
-                               continue;
-                       }
+                       if (!q) continue;

 
                        *q = EchoReq;
                        *(u8 *)(q + 1) = (time_now % 255); // ID
                        *(u16 *)(q + 2) = htons(8); // Length
                        *(u32 *)(q + 4) = 0; // Magic Number (not supported)
 
 
                        *q = EchoReq;
                        *(u8 *)(q + 1) = (time_now % 255); // ID
                        *(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
                }
 
                // Check for actions requested from the CLI


@@ -2085,14 +2082,21 @@ int regular_cleanups(void)
                        cli_session_actions[s].action = 0;
                        if (a & CLI_SESS_KILL)
                        {
                        cli_session_actions[s].action = 0;
                        if (a & CLI_SESS_KILL)
                        {

-                               log(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
+                               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
                        }
 
                                sessionshutdown(s, "Requested by administrator");
                                a = 0; // dead, no need to check for other actions
                        }
 

-                       if (a & CLI_SESS_SNOOP)
+                       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",
+                               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;
                                    inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
 
                                session[s].snoop_ip = cli_session_actions[s].snoop_ip;


@@ -2100,37 +2104,30 @@ int regular_cleanups(void)
                                send++;
                        }
 
                                send++;
                        }
 

-                       if (a & CLI_SESS_NOSNOOP)
+                       if (a & CLI_SESS_NOTHROTTLE)

                        {
                        {

-                               log(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
-                               session[s].snoop_ip = 0;
-                               session[s].snoop_port = 0;
+                               LOG(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
+                               throttle_session(s, 0, 0);

                                send++;
                        }
                                send++;
                        }

-
-                       if (a & CLI_SESS_THROTTLE)
+                       else if (a & CLI_SESS_THROTTLE)

                        {
                        {

-                               log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %d)\n",
-                                   cli_session_actions[s].throttle);
-
-                               throttle_session(s, cli_session_actions[s].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);

 
 

-                       if (a & CLI_SESS_NOTHROTTLE)
-                       {
-                               log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
-                               throttle_session(s, 0);
+                               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 (send)
                                cluster_send_session(s);
 
                        if (++count >= MAX_ACTIONS) break;

-                       continue;

                }
        }
 
                }
        }
 

-       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;


@@ -2140,7 +2137,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;
 }
 


@@ -2149,21 +2146,34 @@ int regular_cleanups(void)
 // Are we in the middle of a tunnel update, or radius
 // requests??
 //
 // Are we in the middle of a tunnel update, or radius
 // requests??
 //

-int still_busy(void)
+static int still_busy(void)

 {
        int i;
 {
        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)


@@ -2171,8 +2181,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;


@@ -2181,42 +2192,37 @@ int still_busy(void)
        return 0;
 }
 
        return 0;
 }
 

+static fd_set readset;
+static int readset_n = 0;
+

 // main loop - gets packets on tun or udp and processes them
 // main loop - gets packets on tun or udp and processes them

-void mainloop(void)
+static void mainloop(void)

 {
 {

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

        u8 buf[65536];
        struct timeval to;
        clockt next_cluster_ping = 0;   // send initial ping immediately
        time_t next_clean = time_now + config->cleanup_interval;
 
        u8 buf[65536];
        struct timeval to;
        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",
+       LOG(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",

                        udpfd, tunfd, cluster_sockfd, controlfd);
 
                        udpfd, tunfd, cluster_sockfd, controlfd);
 

-       FD_ZERO(&cr);
-       FD_SET(udpfd, &cr);
-       FD_SET(tunfd, &cr);
-       FD_SET(controlfd, &cr);
-       FD_SET(clifd, &cr);
-       if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
-       cn = udpfd;
-       if (cn < tunfd) cn = tunfd;
-       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];
-       }
+       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];


@@ -2228,7 +2234,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.
 


@@ -2260,10 +2266,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;
                }


@@ -2293,16 +2300,22 @@ void mainloop(void)
                                                break;
                                }
                        }
                                                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))
                        if (FD_ISSET(controlfd, &r))

-                               processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
+                               processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr, alen);
+

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


@@ -2311,7 +2324,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


@@ -2346,7 +2359,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();
                        }


@@ -2356,10 +2370,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.
                        }
                }


@@ -2386,79 +2405,141 @@ 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)
+static 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 ip_address_pool: %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 ringbuffer: %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_actions = mmap(NULL, sizeof(struct cli_session_actions) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-       if (cli_session_actions == 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 actions: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));

                exit(1);
        }
        memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
                exit(1);
        }
        memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);

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

        {
        {

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

                exit(1);
        }
        memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);
                exit(1);
        }
        memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);


@@ -2469,7 +2550,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.
        }


@@ -2477,38 +2559,28 @@ 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)
        {
 
        if (!*hostname)
        {

-               char *p;

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

-               if ((p = strchr(hostname, '.'))) *p = 0;
+               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)
-       {
-               log(0, 0, 0, 0, "Error doing mmap for bgp: %s\n", strerror(errno));
-               exit(1);
-       }
+       if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))
+       {
+               LOG(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
+               exit(1);
+       }

 #endif /* BGP */
 }
 
 #endif /* BGP */
 }
 

-void initiptables(void)
-{
-       /* Flush the tables here so that we have a clean slate */
-
-// Not needed. 'nat' is setup by garden.c
-// mangle isn't used (as throttling is done by tbf inhouse).
-}
-
-int assign_ip_address(sessionidt s)
+static int assign_ip_address(sessionidt s)

 {
        u32 i;
        int best = -1;
 {
        u32 i;
        int best = -1;


@@ -2541,7 +2613,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;
        }
 


@@ -2559,16 +2631,19 @@ 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;
 }
 

-void free_ip_address(sessionidt s)
+static void free_ip_address(sessionidt s)

 {
        int i = session[s].ip_pool_index;
 
 {
        int i = session[s].ip_pool_index;
 

+
+       CSTAT(call_free_ip_address);
+

        if (!session[s].ip)
                return; // what the?
 
        if (!session[s].ip)
                return; // what the?
 


@@ -2581,10 +2656,6 @@ void free_ip_address(sessionidt s)
        ip_address_pool[i].assigned = 0;
        ip_address_pool[i].session = 0;
        ip_address_pool[i].last = time_now;
        ip_address_pool[i].assigned = 0;
        ip_address_pool[i].session = 0;
        ip_address_pool[i].last = time_now;

-
-
-       CSTAT(call_free_ip_address);
-

 }
 
 //
 }
 
 //


@@ -2601,7 +2672,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)


@@ -2610,25 +2682,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;


@@ -2646,7 +2722,7 @@ void rebuild_address_pool(void)
 //
 // Fix the address pool to match a changed session.
 // (usually when the master sends us an update).
 //
 // Fix the address pool to match a changed session.
 // (usually when the master sends us an update).

-void fix_address_pool(int sid)
+static void fix_address_pool(int sid)

 {
        int ipid;
 
 {
        int ipid;
 


@@ -2667,7 +2743,7 @@ void fix_address_pool(int sid)
 //
 // Add a block of addresses to the IP pool to hand out.
 //
 //
 // Add a block of addresses to the IP pool to hand out.
 //

-void add_to_ip_pool(u32 addr, u32 mask)
+static void add_to_ip_pool(u32 addr, u32 mask)

 {
        int i;
        if (mask == 0)
 {
        int i;
        if (mask == 0)


@@ -2688,14 +2764,14 @@ 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;
                }
        }
 }
 
 // Initialize the IP address pool
                        return;
                }
        }
 }
 
 // Initialize the IP address pool

-void initippool()
+static void initippool()

 {
        FILE *f;
        char *p;
 {
        FILE *f;
        char *p;


@@ -2704,7 +2780,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);
        }
 


@@ -2723,7 +2799,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


@@ -2738,18 +2814,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);


@@ -2761,7 +2837,7 @@ 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)


@@ -2774,102 +2850,105 @@ void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
        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);
 }
 
        STAT(packets_snooped);
 }
 

-void dump_acct_info()
+static 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[])
 {
 }
 
 // Main program
 int main(int argc, char *argv[])
 {

-       int o;
+       int i;

        int optdebug = 0;
        int optdebug = 0;

-
-       _program_name = strdup(argv[0]);
+       char *optconfig = CONFIGFILE;

 
        time(&basetime);             // start clock
 
        // scan args
 
        time(&basetime);             // start clock
 
        // scan args

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

        {
        {

-               switch (o)
+               switch (i)

                {
                {

-                       case 'd':
-                               // Double fork to detach from terminal
-                               if (fork()) exit(0);
-                               if (fork()) exit(0);
-                               break;
-                       case 'v':
-                               optdebug++;
-                               break;
-                       case 'h':
-                               snprintf(hostname, sizeof(hostname), "%s", optarg);
-                               break;
-                       case '?':
-                       default:
-                               printf("Args are:\n"
-                                      "\t-d\tDetach from terminal\n"
-                                      "\t-c <file>\tConfig file\n"
-                                      "\t-h <hostname>\tForce hostname\n"
-                                      "\t-a <address>\tUse specific address\n"
-                                      "\t-v\t\tDebug\n");
-
-                               return (0);
-                               break;
+               case 'd':
+                       if (fork()) exit(0);
+                       setsid();
+                       freopen("/dev/null", "r", stdin);
+                       freopen("/dev/null", "w", stdout);
+                       freopen("/dev/null", "w", stderr);
+                       break;
+               case 'v':
+                       optdebug++;
+                       break;
+               case 'c':
+                       optconfig = optarg;
+                       break;
+               case 'h':
+                       snprintf(hostname, sizeof(hostname), "%s", optarg);
+                       break;
+               default:
+                       printf("Args are:\n"
+                              "\t-d\t\tDetach from terminal\n"
+                              "\t-c <file>\tConfig file\n"
+                              "\t-h <hostname>\tForce hostname\n"
+                              "\t-v\t\tDebug\n");
+
+                       return (0);
+                       break;

                }
        }
 
                }
        }
 


@@ -2879,26 +2958,23 @@ int main(int argc, char *argv[])
        signal(SIGALRM, sigalrm_handler);
        siginterrupt(SIGALRM, 0);
 
        signal(SIGALRM, sigalrm_handler);
        siginterrupt(SIGALRM, 0);
 

-       initiptables();

        initplugins();
        initplugins();

-       initdata();
-
-       config->debug = optdebug;
+       initdata(optdebug, optconfig);

 
 

-       init_tbf();

        init_cli(hostname);
        read_config_file();
        init_cli(hostname);
        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");
        }


@@ -2911,42 +2987,42 @@ 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;
                        }
                }
        }
 
        /* Set up the cluster communications port. */
                                config->scheduler_fifo = 0;
                        }
                }
        }
 
        /* Set up the cluster communications port. */

-       if (cluster_init(config->bind_address) < 0)
+       if (cluster_init() < 0)

                exit(1);
 
 #ifdef BGP
        signal(SIGPIPE, SIG_IGN);
        bgp_setup(config->as_number);
        bgp_add_route(config->bind_address, 0xffffffff);
                exit(1);
 
 #ifdef BGP
        signal(SIGPIPE, SIG_IGN);
        bgp_setup(config->as_number);
        bgp_add_route(config->bind_address, 0xffffffff);

-        if (*config->bgp_peer[0])
-               bgp_start(&bgp_peers[0], config->bgp_peer[0],
-                   config->bgp_peer_as[0], 0); /* 0 = routing disabled */
-
-        if (*config->bgp_peer[1])
-               bgp_start(&bgp_peers[1], config->bgp_peer[1],
-                   config->bgp_peer_as[1], 0);
+       for (i = 0; i < BGP_NUM_PEERS; i++)
+       {
+               if (config->neighbour[i].name[0])
+                       bgp_start(&bgp_peers[i], config->neighbour[i].name,
+                               config->neighbour[i].as, config->neighbour[i].keepalive,
+                               config->neighbour[i].hold, 0); /* 0 = routing disabled */
+       }

 #endif /* BGP */
 
        inittun();
 #endif /* BGP */
 
        inittun();

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

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


@@ -2964,9 +3040,9 @@ int main(int argc, char *argv[])
        if (config->lock_pages)
        {
                if (!mlockall(MCL_CURRENT))
        if (config->lock_pages)
        {
                if (!mlockall(MCL_CURRENT))

-                       log(1, 0, 0, 0, "Locking pages into memory\n");
+                       LOG(1, 0, 0, 0, "Locking pages into memory\n");

                else
                else

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

        }
 
        alarm(1);
        }
 
        alarm(1);


@@ -2980,24 +3056,25 @@ int main(int argc, char *argv[])
 #ifdef BGP
        /* try to shut BGP down cleanly; with luck the sockets will be
           writable since we're out of the select */
 #ifdef BGP
        /* try to shut BGP down cleanly; with luck the sockets will be
           writable since we're out of the select */

-       {
-               int i;
-               for (i = 0; i < BGP_NUM_PEERS; i++)
-                       if (bgp_peers[i].state == Established)
-                               bgp_stop(&bgp_peers[i]);
-       }
+       for (i = 0; i < BGP_NUM_PEERS; i++)
+               if (bgp_peers[i].state == Established)
+                       bgp_stop(&bgp_peers[i]);

 #endif /* BGP */
 
        /* remove plugins (so cleanup code gets run) */
        plugins_done();
 
 #endif /* BGP */
 
        /* 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);
        return 0;
 }
 
        /* kill CLI children */
        signal(SIGTERM, SIG_IGN);
        kill(0, SIGTERM);
        return 0;
 }
 

-void sighup_handler(int junk)
+static void sighup_handler(int sig)

 {
        if (log_stream && log_stream != stderr)
        {
 {
        if (log_stream && log_stream != stderr)
        {


@@ -3008,7 +3085,7 @@ void sighup_handler(int junk)
        read_config_file();
 }
 
        read_config_file();
 }
 

-void sigalrm_handler(int junk)
+static void sigalrm_handler(int sig)

 {
        // Log current traffic stats
 
 {
        // Log current traffic stats
 


@@ -3041,20 +3118,20 @@ void sigalrm_handler(int junk)
 
 }
 
 
 }
 

-void sigterm_handler(int junk)
+static void sigterm_handler(int sig)

 {
 {

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

        if (config->save_state)
                dump_state();
 
        main_quit++;
 }
 
        if (config->save_state)
                dump_state();
 
        main_quit++;
 }
 

-void sigquit_handler(int junk)
+static void sigquit_handler(int sig)

 {
        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)


@@ -3069,190 +3146,200 @@ void sigquit_handler(int junk)
        main_quit++;
 }
 
        main_quit++;
 }
 

-void sigchild_handler(int signal)
+static void sigchild_handler(int sig)

 {
        while (waitpid(-1, NULL, WNOHANG) > 0)
            ;
 }
 
 {
        while (waitpid(-1, NULL, WNOHANG) > 0)
            ;
 }
 

-void read_state()
+static void read_state()

 {
 {

-    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;
-    }
+       struct stat sb;
+       int i;
+       ippoolt itmp;
+       FILE *f;
+       char magic[sizeof(DUMP_MAGIC) - 1];
+       u32 buf[2];

 
 

-    if (stat(STATEFILE, &sb) < 0)
-    {
-       unlink(STATEFILE);
-       return;
-    }
+       if (!config->save_state)
+       {
+               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 (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");
+               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");
-}
-
-void dump_state()
-{
-    FILE *f;
-    u32 buf[2];
-
-    if (!config->save_state)
-       return;

 
 

-    do {
-       if (!(f = fopen(STATEFILE, "w")))
-           break;
+       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");
+}
+
+static void dump_state()
+{
+       FILE *f;
+       u32 buf[2];
+
+       if (!config->save_state)
+               return;

 
 

-       log(1, 0, 0, 0, "Dumping state information\n");
+       do
+       {
+               if (!(f = fopen(STATEFILE, "w")))
+                       break;

 
 

-       if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC)-1, 1, f) != 1) break;
+               LOG(1, 0, 0, 0, "Dumping state information\n");

 
 

-       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;
+               if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
+                       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 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 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 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;

 
 

-       if (fclose(f) == 0) return; // OK
-    } while (0);
+               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);

 
 

-    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)
+static void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)

 {
        MD5_CTX ctx;
        *challenge_response = NULL;
 
        if (!*config->l2tpsecret)
        {
 {
        MD5_CTX ctx;
        *challenge_response = NULL;
 
        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);
 


@@ -3267,16 +3354,16 @@ 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()
+static void update_config()

 {
        int i;
        static int timeout = 0;
 {
        int i;
        static int timeout = 0;


@@ -3325,11 +3412,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;


@@ -3339,6 +3440,7 @@ void update_config()
        {
                if (strcmp(config->plugins[i], config->old_plugins[i]) == 0)
                        continue;
        {
                if (strcmp(config->plugins[i], config->old_plugins[i]) == 0)
                        continue;

+

                if (*config->plugins[i])
                {
                        // Plugin added
                if (*config->plugins[i])
                {
                        // Plugin added


@@ -3371,7 +3473,7 @@ void update_config()
 
                if (config->cluster_hb_timeout < t)
                {
 
                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);
+                       LOG(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);

                        config->cluster_hb_timeout = t;
                }
 
                        config->cluster_hb_timeout = t;
                }
 


@@ -3383,22 +3485,39 @@ void update_config()
                timeout = config->cluster_hb_timeout;
        }
 
                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;
 }
 

-void read_config_file()
+static 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();
 }


@@ -3413,17 +3532,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)));

        }
 
 
        }
 
 


@@ -3445,23 +3566,37 @@ int sessionsetup(tunnelidt t, sessionidt s)
                }
        }
 
                }
        }
 

+       {
+               int routed = 0;
+

                // Add the route for this session.
                // Add the route for this session.

-               //
-               // Static IPs need to be routed. Anything else
-               // is part of the IP address pool and is already routed,
-               // it just needs to be added to the IP cache.
-       if (session[s].ip_pool_index == -1) // static ip
-               routeset(s, session[s].ip, 0, 0, 1);
-       else
-               cache_ipmap(session[s].ip, s);
+               for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
+               {
+                       if ((session[s].ip & session[s].route[r].mask) ==
+                           (session[s].route[r].ip & session[s].route[r].mask))
+                               routed++;
+
+                       routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 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);
+               // Static IPs need to be routed if not already
+               // convered by a Framed-Route.  Anything else is part
+               // of the IP address pool and is already routed, it
+               // just needs to be added to the IP cache.
+               if (session[s].ip_pool_index == -1) // static ip
+               {
+                       if (!routed) routeset(s, session[s].ip, 0, 0, 1);
+               }
+               else
+                       cache_ipmap(session[s].ip, s);
+       }

 
 

-       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.


@@ -3470,10 +3605,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;
 


@@ -3481,7 +3615,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);


@@ -3499,11 +3633,13 @@ int sessionsetup(tunnelidt t, sessionidt s)
 int load_session(sessionidt s, sessiont *new)
 {
        int i;
 int load_session(sessionidt s, sessiont *new)
 {
        int i;

+       int newip = 0;

 
                // 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;
        }


@@ -3515,50 +3651,76 @@ int load_session(sessionidt s, sessiont *new)
 
        session[s].tunnel = new->tunnel; // For logging in cache_ipmap
 
 
        session[s].tunnel = new->tunnel; // For logging in cache_ipmap
 

+       // See if routes/ip cache need updating
+       if (new->ip != session[s].ip)
+               newip++;
+
+       for (i = 0; !newip && i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
+               if (new->route[i].ip != session[s].route[i].ip ||
+                   new->route[i].mask != session[s].route[i].mask)
+                       newip++;

 
 

-       if (new->ip != session[s].ip)   // Changed ip. fix up hash tables.
+       // needs update
+       if (newip)

        {
        {

-               if (session[s].ip)      // If there's an old one, remove it.
+               int routed = 0;
+
+               // remove old routes...
+               for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)

                {
                {

-                       // Remove any routes if the IP has changed
-                       for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
-                       {
-                               routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
-                               session[s].route[i].ip = 0;
-                       }
+                       if ((session[s].ip & session[s].route[i].mask) ==
+                           (session[s].route[i].ip & session[s].route[i].mask))
+                               routed++;
+
+                       routeset(s, session[s].route[i].ip, session[s].route[i].mask, 0, 0);
+               }

 
 

+               // ...ip
+               if (session[s].ip)
+               {

                        if (session[s].ip_pool_index == -1) // static IP
                        if (session[s].ip_pool_index == -1) // static IP

-                               routeset(s, session[s].ip, 0, 0, 0);
+                       {
+                               if (!routed) routeset(s, session[s].ip, 0, 0, 0);
+                       }

                        else            // It's part of the IP pool, remove it manually.
                                uncache_ipmap(session[s].ip);
                }
 
                        else            // It's part of the IP pool, remove it manually.
                                uncache_ipmap(session[s].ip);
                }
 

-               if (new->ip) {          // If there's a new one, add it.
+               routed = 0;
+
+               // add new routes...
+               for (i = 0; i < MAXROUTE && new->route[i].ip; i++)
+               {
+                       if ((new->ip & new->route[i].mask) ==
+                           (new->route[i].ip & new->route[i].mask))
+                               routed++;
+
+                       routeset(s, new->route[i].ip, new->route[i].mask, 0, 1);
+               }
+
+               // ...ip
+               if (new->ip)
+               {
+                       // If there's a new one, add it.

                        if (new->ip_pool_index == -1)
                        if (new->ip_pool_index == -1)

-                               routeset(s, new->ip, 0, 0, 1);
+                       {
+                               if (!routed) routeset(s, new->ip, 0, 0, 1);
+                       }

                        else
                                cache_ipmap(new->ip, s);
                }
        }
 
                        else
                                cache_ipmap(new->ip, s);
                }
        }
 

-       // Update routed networks
-       for (i = 0; i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
-       {
-               if (new->route[i].ip == session[s].route[i].ip &&
-                   new->route[i].mask == session[s].route[i].mask)
-                       continue;
-
-               if (session[s].route[i].ip) // Remove the old one if it exists.
-                       routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
-
-               if (new->route[i].ip)   // Add the new one if it exists.
-                       routeset(s, new->route[i].ip, new->route[i].mask, new->ip, 1);
-       }
-

        if (new->tunnel && s > config->cluster_highest_sessionid)       // Maintain this in the slave. It's used
                                        // for walking the sessions to forward byte counts to the master.
                config->cluster_highest_sessionid = s;
 
        if (new->tunnel && s > config->cluster_highest_sessionid)       // Maintain this in the slave. It's used
                                        // 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.


@@ -3568,22 +3730,7 @@ int load_session(sessionidt s, sessiont *new)
        return 1;
 }
 
        return 1;
 }
 

-#ifdef RINGBUFFER
-void ringbuffer_dump(FILE *stream)
-{
-       int i = ringbuffer->head;
-
-       while (i != ringbuffer->tail)
-       {
-               if (*ringbuffer->buffer[i].message)
-                       fprintf(stream, "%d-%s", ringbuffer->buffer[i].level, ringbuffer->buffer[i].message);
-               if (++i == ringbuffer->tail) break;
-               if (i == RINGBUFFER_SIZE) i = 0;
-       }
-}
-#endif
-
-void initplugins()
+static void initplugins()

 {
        int i;
 
 {
        int i;
 


@@ -3598,11 +3745,34 @@ 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);
 }
 

-void add_plugin(char *plugin_name)
+// plugin callback to get a config value
+static void *getconfig(char *key, enum config_typet type)
+{
+       int i;
+
+       for (i = 0; config_values[i].key; i++)
+       {
+               if (!strcmp(config_values[i].key, key))
+               {
+                       if (config_values[i].type == type)
+                               return ((void *) config) + config_values[i].offset;
+
+                       LOG(1, 0, 0, 0, "plugin requested config item \"%s\" expecting type %d, have type %d\n",
+                               key, type, config_values[i].type);
+
+                       return 0;
+               }
+       }
+
+       LOG(1, 0, 0, 0, "plugin requested unknown config item \"%s\"\n", key);
+       return 0;
+}
+
+static int add_plugin(char *plugin_name)

 {
        static struct pluginfuncs funcs = {
                _log,
 {
        static struct pluginfuncs funcs = {
                _log,


@@ -3611,9 +3781,12 @@ void add_plugin(char *plugin_name)
                sessionbyuser,
                sessiontbysessionidt,
                sessionidtbysessiont,
                sessionbyuser,
                sessiontbysessionidt,
                sessionidtbysessiont,

-               sessionkill,

                radiusnew,
                radiussend,
                radiusnew,
                radiussend,

+               getconfig,
+               sessionkill,
+               throttle_session,
+               cluster_send_session,

        };
 
        void *p = open_plugin(plugin_name, 1);
        };
 
        void *p = open_plugin(plugin_name, 1);


@@ -3622,23 +3795,23 @@ void add_plugin(char *plugin_name)
 
        if (!p)
        {
 
        if (!p)
        {

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

        }
 
        if (ll_contains(loaded_plugins, p))
        {
                dlclose(p);
        }
 
        if (ll_contains(loaded_plugins, p))
        {
                dlclose(p);

-               return;
+               return 0; // already loaded

        }
 
        {
        }
 
        {

-               int *v = dlsym(p, "__plugin_api_version");
+               int *v = dlsym(p, "plugin_api_version");

                if (!v || *v != 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);
                        dlclose(p);

-                       return;
+                       return -1;

                }
        }
 
                }
        }
 


@@ -3646,9 +3819,9 @@ 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);
                        dlclose(p);

-                       return;
+                       return -1;

                }
        }
 
                }
        }
 


@@ -3659,12 +3832,13 @@ 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);
+       return 1;

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


@@ -3675,48 +3849,54 @@ static void run_plugin_done(void *plugin)
                donefunc();
 }
 
                donefunc();
 }
 

-void remove_plugin(char *plugin_name)
+static int remove_plugin(char *plugin_name)

 {
        void *p = open_plugin(plugin_name, 0);
 {
        void *p = open_plugin(plugin_name, 0);

-       int i;
+       int loaded = 0;

 
        if (!p)
 
        if (!p)

-               return;
-
-       for (i = 0; i < max_plugin_functions; i++)
-       {
-               void *x;
-               if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
-                       ll_delete(plugins[i], x);
-       }
+               return -1;

 
        if (ll_contains(loaded_plugins, p))
        {
 
        if (ll_contains(loaded_plugins, p))
        {

+               int i;
+               for (i = 0; i < max_plugin_functions; i++)
+               {
+                       void *x;
+                       if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
+                               ll_delete(plugins[i], x);
+               }
+

                ll_delete(loaded_plugins, p);
                run_plugin_done(p);
                ll_delete(loaded_plugins, p);
                run_plugin_done(p);

+               loaded = 1;

        }
 
        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);
+       return loaded;

 }
 
 int run_plugins(int plugin_type, void *data)
 {
        int (*func)(void *data);
 }
 
 int run_plugins(int plugin_type, void *data)
 {
        int (*func)(void *data);

-       if (!plugins[plugin_type] || plugin_type > max_plugin_functions) return 1;
+
+       if (!plugins[plugin_type] || plugin_type > max_plugin_functions)
+               return PLUGIN_RET_ERROR;

 
        ll_reset(plugins[plugin_type]);
        while ((func = ll_next(plugins[plugin_type])))
        {
 
        ll_reset(plugins[plugin_type]);
        while ((func = ll_next(plugins[plugin_type])))
        {

-               int rc;
-               rc = func(data);
-               if (rc == PLUGIN_RET_STOP) return 1;
-               if (rc == PLUGIN_RET_ERROR) return 0;
+               int r = func(data);
+
+               if (r != PLUGIN_RET_OK)
+                       return r; // stop here

        }
        }

-       return 1;
+
+       return PLUGIN_RET_OK;

 }
 
 }
 

-void plugins_done()
+static void plugins_done()

 {
        void *p;
 
 {
        void *p;
 


@@ -3725,83 +3905,190 @@ void plugins_done()
                run_plugin_done(p);
 }
 
                run_plugin_done(p);
 }
 

-void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
+static void processcontrol(u8 * buf, int len, struct sockaddr_in *addr, int alen)

 {
 {

-       char *resp;
-       int l;
-       struct param_control param = { buf, len, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), NULL, 0, 0 };
-
+       struct nsctl request;
+       struct nsctl response;
+       int type = unpack_control(&request, buf, len);
+       int r;
+       void *p;

 
        if (log_stream && config->debug >= 4)
        {
 
        if (log_stream && config->debug >= 4)
        {

-               log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
-               dump_packet(buf, log_stream);
+               if (type < 0)
+               {
+                       LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Bogus control message (%d)\n", type);
+               }
+               else
+               {
+                       LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
+                       dump_control(&request, log_stream);
+               }

        }
 
        }
 

-       resp = calloc(1400, 1);
-       l = new_packet(PKT_RESP_ERROR, resp);
-       *(int *)(resp + 6) = *(int *)(buf + 6);
+       switch (type)
+       {
+       case NSCTL_REQ_LOAD:
+               if (request.argc != 1)
+               {
+                       response.type = NSCTL_RES_ERR;
+                       response.argc = 1;
+                       response.argv[0] = "name of plugin required";
+               }
+               else if ((r = add_plugin(request.argv[0])) < 1)
+               {
+                       response.type = NSCTL_RES_ERR;
+                       response.argc = 1;
+                       response.argv[0] = !r
+                               ? "plugin already loaded"
+                               : "error loading plugin";
+               }
+               else
+               {
+                       response.type = NSCTL_RES_OK;
+                       response.argc = 0;
+               }

 
 

-       param.type = ntohs(*(short *)(buf + 2));
-       param.id = ntohl(*(int *)(buf + 6));
-       param.data_length = ntohs(*(short *)(buf + 4)) - 10;
-       param.data = (param.data_length > 0) ? (char *)(buf + 10) : NULL;
-       param.response = resp;
-       param.response_length = l;
+               break;

 
 

-       run_plugins(PLUGIN_CONTROL, &param);
+       case NSCTL_REQ_UNLOAD:
+               if (request.argc != 1)
+               {
+                       response.type = NSCTL_RES_ERR;
+                       response.argc = 1;
+                       response.argv[0] = "name of plugin required";
+               }
+               else if ((r = remove_plugin(request.argv[0])) < 1)
+               {
+                       response.type = NSCTL_RES_ERR;
+                       response.argc = 1;
+                       response.argv[0] = !r
+                               ? "plugin not loaded"
+                               : "plugin not found";
+               }
+               else
+               {
+                       response.type = NSCTL_RES_OK;
+                       response.argc = 0;
+               }

 
 

-       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");
-       }
+               break;

 
 

-       free(resp);
-}
+       case NSCTL_REQ_HELP:
+               response.type = NSCTL_RES_OK;
+               response.argc = 0;

 
 

-/*
- * HACK
- * Go through all of the tunnels and do some cleanups
- */
-void tunnel_clean()
-{
-       int i;
+               ll_reset(loaded_plugins);
+               while ((p = ll_next(loaded_plugins)))
+               {
+                       char **help = dlsym(p, "plugin_control_help");
+                       while (response.argc < 0xff && help && *help)
+                               response.argv[response.argc++] = *help++;
+               }

 
 

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

 
 

-       for (i = 1; i < MAXTUNNEL; i++)
+       case NSCTL_REQ_CONTROL:
+               {
+                       struct param_control param = {
+                               config->cluster_iam_master,
+                               request.argc,
+                               request.argv,
+                               0,
+                               NULL,
+                       };
+
+                       int r = run_plugins(PLUGIN_CONTROL, &param);
+
+                       if (r == PLUGIN_RET_ERROR)
+                       {
+                               response.type = NSCTL_RES_ERR;
+                               response.argc = 1;
+                               response.argv[0] = param.additional
+                                       ? param.additional
+                                       : "error returned by plugin";
+                       }
+                       else if (r == PLUGIN_RET_NOTMASTER)
+                       {
+                               static char msg[] = "must be run on master: 000.000.000.000";
+
+                               response.type = NSCTL_RES_ERR;
+                               response.argc = 1;
+                               if (config->cluster_master_address)
+                               {
+                                       strcpy(msg + 23, inet_toa(config->cluster_master_address));
+                                       response.argv[0] = msg;
+                               }
+                               else
+                               {
+                                       response.argv[0] = "must be run on master: none elected";
+                               }
+                       }
+                       else if (!(param.response & NSCTL_RESPONSE))
+                       {
+                               response.type = NSCTL_RES_ERR;
+                               response.argc = 1;
+                               response.argv[0] = param.response
+                                       ? "unrecognised response value from plugin"
+                                       : "unhandled action";
+                       }
+                       else
+                       {
+                               response.type = param.response;
+                               response.argc = 0;
+                               if (param.additional)
+                               {
+                                       response.argc = 1;
+                                       response.argv[0] = param.additional;
+                               }
+                       }
+               }
+
+               break;
+
+       default:
+               response.type = NSCTL_RES_ERR;
+               response.argc = 1;
+               response.argv[0] = "error unpacking control packet";
+       }
+
+       buf = calloc(NSCTL_MAX_PKT_SZ, 1);
+       if (!buf)
+       {
+               LOG(2, ntohl(addr->sin_addr.s_addr), 0, 0, "Failed to allocate nsctl response\n");
+               return;
+       }
+
+       r = pack_control(buf, NSCTL_MAX_PKT_SZ, response.type, response.argc, response.argv);
+       if (r > 0)

        {
        {

-               if (!tunnel[i].ip
-                               || !*tunnel[i].hostname
-                               || (tunnel[i].state == TUNNELDIE && tunnel[i].die >= time_now))
+               sendto(controlfd, buf, r, 0, (const struct sockaddr *) addr, alen);
+               if (log_stream && config->debug >= 4)

                {
                {

-                       tunnelclear(i);
+                       LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent ");
+                       dump_control(&response, log_stream);

                }
        }
                }
        }

-}
+       else
+               LOG(2, ntohl(addr->sin_addr.s_addr), 0, 0, "Failed to pack nsctl response (%d)\n", r);

 
 

-void tunnelclear(tunnelidt t)
-{
-       if (!t) return;
-       memset(&tunnel[t], 0, sizeof(tunnel[t]));
-       tunnel[t].state = TUNNELFREE;
+       free(buf);

 }
 
 }
 

-tunnelidt new_tunnel()
+static tunnelidt new_tunnel()

 {
        tunnelidt i;
        for (i = 1; i < MAXTUNNEL; i++)
        {
                if (tunnel[i].state == TUNNELFREE)
                {
 {
        tunnelidt i;
        for (i = 1; i < MAXTUNNEL; i++)
        {
                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;
 }
 


@@ -3814,18 +4101,32 @@ 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 = 1; 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++)
+       {
+               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)
 {


@@ -3839,7 +4140,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 = 1; 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;


@@ -3855,7 +4157,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]);


@@ -3875,7 +4178,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 = 1; 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;


@@ -3883,7 +4187,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.
                }


@@ -3892,10 +4197,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.
+ */
+static 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;
+}
+