remove old compatability code

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index b988b78..a729992 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.86 2005-03-10 05:47:24 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.114 2005-07-04 05:49:46 bodea Exp $";

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


@@ -52,7 +52,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.86 2005-03-10 05:47:24 bodea Exp
 
 #ifdef BGP
 #include "bgp.h"
 
 #ifdef BGP
 #include "bgp.h"

-#endif /* BGP */
+#endif

 
 // Globals
 configt *config = NULL;                // all configuration
 
 // Globals
 configt *config = NULL;                // all configuration


@@ -60,19 +60,20 @@ 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 udpfd = -1;                        // UDP file handle
 int controlfd = -1;            // Control signal handle
 int clifd = -1;                        // Socket listening for CLI connections.

+int daefd = -1;                        // Socket listening for DAE 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
 int ifr6fd = -1;               // File descriptor for IPv6 routing, etc
 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
 int ifr6fd = -1;               // File descriptor for IPv6 routing, etc

-static int rand_fd = -1;       // Random data source
+int rand_fd = -1;              // Random data source
+int cluster_sockfd = -1;       // Intra-cluster communications socket.
+int epollfd = -1;              // event polling

 time_t basetime = 0;           // base clock
 char hostname[1000] = "";      // us.
 static int tunidx;             // ifr_ifindex of tun device
 time_t basetime = 0;           // base clock
 char hostname[1000] = "";      // us.
 static int tunidx;             // ifr_ifindex of tun device

-static uint32_t sessionid = 0; // session id for radius accounting

 static int syslog_log = 0;     // are we logging to syslog
 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.
-uint32_t last_id = 0;          // Last used PPP SID. Can I kill this?? -- mo
+static FILE *log_stream = 0;   // file handle for direct logging (i.e. direct into file, not via syslog).
+uint32_t last_id = 0;          // Unique ID for radius accounting

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


@@ -91,7 +92,7 @@ uint32_t eth_tx = 0;
 static uint32_t 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 uint32_t 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.
+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];
 


@@ -111,8 +112,11 @@ config_descriptt config_values[] = {
        CONFIG("primary_radius_port", radiusport[0], SHORT),
        CONFIG("secondary_radius_port", radiusport[1], SHORT),
        CONFIG("radius_accounting", radius_accounting, BOOL),
        CONFIG("primary_radius_port", radiusport[0], SHORT),
        CONFIG("secondary_radius_port", radiusport[1], SHORT),
        CONFIG("radius_accounting", radius_accounting, BOOL),

+       CONFIG("radius_interim", radius_interim, INT),

        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("radius_authtypes", radius_authtypes_s, STRING),
        CONFIG("radius_secret", radiussecret, STRING),
        CONFIG("radius_authtypes", radius_authtypes_s, STRING),

+       CONFIG("radius_dae_port", radius_dae_port, SHORT),
+       CONFIG("allow_duplicate_users", allow_duplicate_users, BOOL),

        CONFIG("bind_address", bind_address, IPv4),
        CONFIG("peer_address", peer_address, IPv4),
        CONFIG("send_garp", send_garp, BOOL),
        CONFIG("bind_address", bind_address, IPv4),
        CONFIG("peer_address", peer_address, IPv4),
        CONFIG("send_garp", send_garp, BOOL),


@@ -121,7 +125,6 @@ config_descriptt config_values[] = {
        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),

-       CONFIG("cleanup_interval", cleanup_interval, INT),

        CONFIG("multi_read_count", multi_read_count, INT),
        CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
        CONFIG("lock_pages", lock_pages, BOOL),
        CONFIG("multi_read_count", multi_read_count, INT),
        CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
        CONFIG("lock_pages", lock_pages, BOOL),


@@ -131,6 +134,7 @@ 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),

+       CONFIG("cluster_master_min_adv", cluster_master_min_adv, INT),

        CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
        { NULL, 0, 0, 0 },
 };
        CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
        { NULL, 0, 0, 0 },
 };


@@ -146,6 +150,7 @@ static char *plugin_functions[] = {
        "plugin_kill_session",
        "plugin_control",
        "plugin_radius_response",
        "plugin_kill_session",
        "plugin_control",
        "plugin_radius_response",

+       "plugin_radius_reset",

        "plugin_become_master",
        "plugin_new_session_master",
 };
        "plugin_become_master",
        "plugin_new_session_master",
 };


@@ -161,7 +166,7 @@ sessiont *session = NULL;           // Array of session structures.
 sessionlocalt *sess_local = NULL;      // Array of local per-session counters.
 radiust *radius = NULL;                        // Array of radius structures.
 ippoolt *ip_address_pool = NULL;       // Array of dynamic IP addresses.
 sessionlocalt *sess_local = NULL;      // Array of local per-session counters.
 radiust *radius = NULL;                        // Array of radius structures.
 ippoolt *ip_address_pool = NULL;       // Array of dynamic IP addresses.

-ip_filtert *ip_filters = NULL; // Array of named filters.
+ip_filtert *ip_filters = NULL;         // Array of named filters.

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


@@ -175,8 +180,7 @@ static void free_ip_address(sessionidt s);
 static void dump_acct_info(int all);
 static void sighup_handler(int sig);
 static void sigalrm_handler(int sig);
 static void dump_acct_info(int all);
 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 shutdown_handler(int sig);

 static void sigchild_handler(int sig);
 static void build_chap_response(char *challenge, uint8_t id, uint16_t challenge_length, char **challenge_response);
 static void update_config(void);
 static void sigchild_handler(int sig);
 static void build_chap_response(char *challenge, uint8_t id, uint16_t challenge_length, char **challenge_response);
 static void update_config(void);


@@ -189,11 +193,19 @@ static void processcontrol(uint8_t *buf, int len, struct sockaddr_in *addr, int
 static tunnelidt new_tunnel(void);
 static void unhide_value(uint8_t *value, size_t len, uint16_t type, uint8_t *vector, size_t vec_len);
 
 static tunnelidt new_tunnel(void);
 static void unhide_value(uint8_t *value, size_t len, uint16_t type, uint8_t *vector, size_t vec_len);
 

-// return internal time (10ths since process startup)
-static clockt now(void)
+// on slaves, alow BGP to withdraw cleanly before exiting
+#define QUIT_DELAY     5
+
+// quit actions (master)
+#define QUIT_FAILOVER  1 // SIGTERM: exit when all control messages have been acked (for cluster failover)
+#define QUIT_SHUTDOWN  2 // SIGQUIT: shutdown sessions/tunnels, reject new connections
+
+// return internal time (10ths since process startup), set f if given
+static clockt now(double *f)

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

+       if (f) *f = t.tv_sec + t.tv_usec / 1000000.0;

        return (t.tv_sec - basetime) * 10 + t.tv_usec / 100000 + 1;
 }
 
        return (t.tv_sec - basetime) * 10 + t.tv_usec / 100000 + 1;
 }
 


@@ -203,7 +215,7 @@ static clockt now(void)
 clockt backoff(uint8_t try)
 {
        if (try > 5) try = 5;                  // max backoff
 clockt backoff(uint8_t try)
 {
        if (try > 5) try = 5;                  // max backoff

-       return now() + 10 * (1 << try);
+       return now(NULL) + 10 * (1 << try);

 }
 
 
 }
 
 


@@ -297,6 +309,16 @@ void _log_hex(int level, const char *title, const char *data, int maxsize)
        }
 }
 
        }
 }
 

+// update a counter, accumulating 2^32 wraps
+void increment_counter(uint32_t *counter, uint32_t *wrap, uint32_t delta)
+{
+       uint32_t new = *counter + delta;
+       if (new < *counter)
+               (*wrap)++;
+
+       *counter = new;
+}
+

 // initialise the random generator
 static void initrandom(char *source)
 {
 // initialise the random generator
 static void initrandom(char *source)
 {


@@ -307,7 +329,8 @@ static void initrandom(char *source)
                return;
 
        // close previous source, if any
                return;
 
        // close previous source, if any

-       if (rand_fd >= 0) close(rand_fd);
+       if (rand_fd >= 0)
+               close(rand_fd);

 
        rand_fd = -1;
 
 
        rand_fd = -1;
 


@@ -324,13 +347,6 @@ static void initrandom(char *source)
                                        path, strerror(errno));
                }
        }
                                        path, strerror(errno));
                }
        }

-
-       // no source: seed prng
-       {
-               unsigned seed = time_now ^ getpid();
-               LOG(4, 0, 0, "Seeding the pseudo random generator: %u\n", seed);
-               srand(seed);
-       }

 }
 
 // fill buffer with random data
 }
 
 // fill buffer with random data


@@ -351,7 +367,7 @@ void random_data(uint8_t *buf, int len)
                                        strerror(errno));
 
                                // fall back to rand()
                                        strerror(errno));
 
                                // fall back to rand()

-                               initrandom(0);
+                               initrandom(NULL);

                        }
 
                        n = 0;
                        }
 
                        n = 0;


@@ -565,7 +581,7 @@ static void inittun(void)
        }
 }
 
        }
 }
 

-// set up UDP port
+// set up UDP ports

 static void initudp(void)
 {
        int on = 1;
 static void initudp(void)
 {
        int on = 1;


@@ -587,7 +603,6 @@ static void initudp(void)
                LOG(0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
                exit(1);
        }
                LOG(0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
                exit(1);
        }

-       snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

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


@@ -600,6 +615,21 @@ static void initudp(void)
                LOG(0, 0, 0, "Error in control bind: %s\n", strerror(errno));
                exit(1);
        }
                LOG(0, 0, 0, "Error in control bind: %s\n", strerror(errno));
                exit(1);
        }

+
+       // Dynamic Authorization Extensions to RADIUS
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_port = htons(config->radius_dae_port);
+       daefd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+       setsockopt(daefd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+       if (bind(daefd, (void *) &addr, sizeof(addr)) < 0)
+       {
+               LOG(0, 0, 0, "Error in DAE bind: %s\n", strerror(errno));
+               exit(1);
+       }
+
+       // Intercept
+       snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

 }
 
 //
 }
 
 //


@@ -997,7 +1027,8 @@ static void processipout(uint8_t * buf, int len)
                if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
                {
                        LOG(4, 0, 0, "IP: Sending ICMP host unreachable to %s\n", fmtaddr(*(in_addr_t *)(buf + 12), 0));
                if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
                {
                        LOG(4, 0, 0, "IP: Sending ICMP host unreachable to %s\n", fmtaddr(*(in_addr_t *)(buf + 12), 0));

-                       host_unreachable(*(in_addr_t *)(buf + 12), *(uint16_t *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
+                       host_unreachable(*(in_addr_t *)(buf + 12), *(uint16_t *)(buf + 4),
+                               config->bind_address ? config->bind_address : my_address, buf, len);

                }
                return;
        }
                }
                return;
        }


@@ -1076,11 +1107,13 @@ static void processipout(uint8_t * buf, int len)
        if (sp->snoop_ip && sp->snoop_port)
                snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
 
        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
+       increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
+       sp->cout_delta += len;

        sp->pout++;
        udp_tx += len;
        sp->pout++;
        udp_tx += len;

+

        sess_local[s].cout += len;      // To send to master..
        sess_local[s].cout += len;      // To send to master..

+       sess_local[s].pout++;

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


@@ -1185,11 +1218,13 @@ static void processipv6out(uint8_t * buf, int len)
        if (sp->snoop_ip && sp->snoop_port)
                snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
 
        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
+       increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
+       sp->cout_delta += len;

        sp->pout++;
        udp_tx += len;
        sp->pout++;
        udp_tx += len;

+

        sess_local[s].cout += len;      // To send to master..
        sess_local[s].cout += len;      // To send to master..

+       sess_local[s].pout++;

 }
 
 //
 }
 
 //


@@ -1235,11 +1270,13 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
        if (sp->snoop_ip && sp->snoop_port)
                snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
 
        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
+       increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
+       sp->cout_delta += len;

        sp->pout++;
        udp_tx += len;
        sp->pout++;
        udp_tx += len;

+

        sess_local[s].cout += len;      // To send to master..
        sess_local[s].cout += len;      // To send to master..

+       sess_local[s].pout++;

 }
 
 // add an AVP (16 bit)
 }
 
 // add an AVP (16 bit)


@@ -1323,11 +1360,11 @@ static 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

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

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

-       *(uint16_t *) (c->buf + 6) = htons(s ? session[s].far : 0); // session
+       *(uint16_t *) (c->buf + 6) = htons(far); // session

        *(uint16_t *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
        tunnel[t].ns++;              // advance sequence
        // link in message in to queue
        *(uint16_t *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
        tunnel[t].ns++;              // advance sequence
        // link in message in to queue


@@ -1395,7 +1432,7 @@ void throttle_session(sessionidt s, int rate_in, int rate_out)
 }
 
 // add/remove filters from session (-1 = no change)
 }
 
 // add/remove filters from session (-1 = no change)

-static void filter_session(sessionidt s, int filter_in, int filter_out)
+void filter_session(sessionidt s, int filter_in, int filter_out)

 {
        if (!session[s].opened)
                return; // No-one home.
 {
        if (!session[s].opened)
                return; // No-one home.


@@ -1433,7 +1470,7 @@ static void filter_session(sessionidt s, int filter_in, int filter_out)
 }
 
 // start tidy shutdown of session
 }
 
 // start tidy shutdown of session

-void sessionshutdown(sessionidt s, char *reason)
+void sessionshutdown(sessionidt s, char *reason, int result, int error)

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


@@ -1453,25 +1490,21 @@ void sessionshutdown(sessionidt s, char *reason)
                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 
                run_plugins(PLUGIN_KILL_SESSION, &data);
        }
 

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

        {
                // RADIUS Stop message
        {
                // RADIUS Stop message

-               uint16_t r = session[s].radius;
+               uint16_t r = sess_local[s].radius;

                if (!r)
                if (!r)

+                       r = radiusnew(s);
+
+               if (r)

                {
                {

-                       if (!(r = radiusnew(s)))
-                       {
-                               LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
-                               STAT(radius_overflow);
-                       }
-                       else
-                       {
-                               random_data(radius[r].auth, sizeof(radius[r].auth));
-                       }
+                       // stop, if not already trying
+                       if (radius[r].state != RADIUSSTOP)
+                               radiussend(r, RADIUSSTOP);

                }
                }

-
-               if (r && radius[r].state != RADIUSSTOP)
-                       radiussend(r, RADIUSSTOP); // stop, if not already trying
+               else
+                       LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");

 
                // Save counters to dump to accounting file
                if (*config->accounting_dir && shut_acct_n < sizeof(shut_acct) / sizeof(*shut_acct))
 
                // Save counters to dump to accounting file
                if (*config->accounting_dir && shut_acct_n < sizeof(shut_acct) / sizeof(*shut_acct))


@@ -1508,11 +1541,21 @@ void sessionshutdown(sessionidt s, char *reason)
        if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
                throttle_session(s, 0, 0);
 
        if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
                throttle_session(s, 0, 0);
 

+       if (result)

        {                            // Send CDN
                controlt *c = controlnew(14); // sending CDN
        {                            // Send CDN
                controlt *c = controlnew(14); // sending CDN

-               control16(c, 1, 3, 1);    // result code (admin reasons - TBA make error, general error, add message
+               if (error)
+               {
+                       char buf[4];
+                       *(uint16_t *) buf     = htons(result);
+                       *(uint16_t *) (buf+2) = htons(error);
+                       controlb(c, 1, buf, 4, 1);
+               }
+               else
+                       control16(c, 1, result, 1);
+

                control16(c, 14, s, 1);   // assigned session (our end)
                control16(c, 14, s, 1);   // assigned session (our end)

-               controladd(c, session[s].tunnel, s); // send the message
+               controladd(c, session[s].tunnel, session[s].far); // send the message

        }
 
        if (!session[s].die)
        }
 
        if (!session[s].die)


@@ -1528,7 +1571,7 @@ void sessionshutdown(sessionidt s, char *reason)
 void sendipcp(tunnelidt t, sessionidt s)
 {
        uint8_t buf[MAXCONTROL];
 void sendipcp(tunnelidt t, sessionidt s)
 {
        uint8_t buf[MAXCONTROL];

-       uint16_t r = session[s].radius;
+       uint16_t r = sess_local[s].radius;

        uint8_t *q;
 
        CSTAT(sendipcp);
        uint8_t *q;
 
        CSTAT(sendipcp);


@@ -1536,6 +1579,12 @@ void sendipcp(tunnelidt t, sessionidt s)
        if (!r)
                r = radiusnew(s);
 
        if (!r)
                r = radiusnew(s);
 

+       if (!r)
+       {
+               sessionshutdown(s, "No free RADIUS sessions for IPCP", 3, 0);
+               return;
+       }
+

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


@@ -1546,7 +1595,7 @@ void sendipcp(tunnelidt t, sessionidt s)
        if (radius[r].try > 10)
        {
                radiusclear(r, s);      // Clear radius session.
        if (radius[r].try > 10)
        {
                radiusclear(r, s);      // Clear radius session.

-               sessionshutdown(s, "No reply on IPCP");
+               sessionshutdown(s, "No reply to IPCP.", 3, 0);

                return;
        }
 
                return;
        }
 


@@ -1554,7 +1603,7 @@ void sendipcp(tunnelidt t, sessionidt s)
        if (!q) return;
 
        *q = ConfigReq;
        if (!q) return;
 
        *q = ConfigReq;

-       q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
+       q[1] = r >> RADIUS_SHIFT;                    // ID, dont care, we only send one type of request

        *(uint16_t *) (q + 2) = htons(10);
        q[4] = 3;
        q[5] = 6;
        *(uint16_t *) (q + 2) = htons(10);
        q[4] = 3;
        q[5] = 6;


@@ -1576,7 +1625,7 @@ void sendipcp(tunnelidt t, sessionidt s)
                if (!q) return;
 
                *q = ConfigReq;
                if (!q) return;
 
                *q = ConfigReq;

-               q[1] = r << RADIUS_SHIFT;               // ID, don't care, we
+               q[1] = r >> RADIUS_SHIFT;               // ID, don't care, we

                                                        // only send one type
                                                        // of request
                *(uint16_t *) (q + 2) = htons(14);
                                                        // only send one type
                                                        // of request
                *(uint16_t *) (q + 2) = htons(14);


@@ -1590,6 +1639,17 @@ void sendipcp(tunnelidt t, sessionidt s)
        }
 }
 
        }
 }
 

+static void sessionclear(sessionidt s)
+{
+       memset(&session[s], 0, sizeof(session[s]));
+       memset(&sess_local[s], 0, sizeof(sess_local[s]));
+       memset(&cli_session_actions[s], 0, sizeof(cli_session_actions[s]));
+
+       session[s].tunnel = T_FREE;     // Mark it as free.
+       session[s].next = sessionfree;
+       sessionfree = s;
+}
+

 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {


@@ -1606,17 +1666,12 @@ void sessionkill(sessionidt s, char *reason)
        }
 
        session[s].die = TIME;
        }
 
        session[s].die = TIME;

-       sessionshutdown(s, reason);  // close radius/routes, etc.
-       if (session[s].radius)
-               radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
+       sessionshutdown(s, reason, 3, 0);  // close radius/routes, etc.
+       if (sess_local[s].radius)
+               radiusclear(sess_local[s].radius, s); // cant send clean accounting data, session is killed

 
        LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
 
        LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);

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

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


@@ -1676,7 +1731,7 @@ static void tunnelshutdown(tunnelidt t, char *reason, int result, int error, cha
        // close session
        for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
                if (session[s].tunnel == t)
        // close session
        for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
                if (session[s].tunnel == t)

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

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


@@ -1783,12 +1838,11 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                uint16_t message = 0xFFFF;      // message type
                uint8_t fatal = 0;
                uint8_t mandatory = 0;
                uint16_t message = 0xFFFF;      // message type
                uint8_t fatal = 0;
                uint8_t mandatory = 0;

-               uint8_t chap = 0;               // if CHAP being used
+               uint8_t authtype = 0;           // proxy auth type

                uint16_t asession = 0;          // assigned session
                uint32_t amagic = 0;            // magic number
                uint8_t aflags = 0;             // flags from last LCF
                uint16_t version = 0x0100;      // protocol version (we handle 0.0 as well and send that back just in case)
                uint16_t asession = 0;          // assigned session
                uint32_t amagic = 0;            // magic number
                uint8_t aflags = 0;             // flags from last LCF
                uint16_t version = 0x0100;      // protocol version (we handle 0.0 as well and send that back just in case)

-               int requestchap = 0;            // do we request PAP instead of original CHAP request?

                char called[MAXTEL] = "";       // called number
                char calling[MAXTEL] = "";      // calling number
 
                char called[MAXTEL] = "";       // called number
                char calling[MAXTEL] = "";      // calling number
 


@@ -1987,8 +2041,6 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                                continue;
                                        }
 
                                                continue;
                                        }
 

-                                       LOG(4, s, t, "Hidden AVP\n");
-

                                        // Unhide the AVP
                                        unhide_value(b, n, mtype, session[s].random_vector, session[s].random_vector_length);
 
                                        // Unhide the AVP
                                        unhide_value(b, n, mtype, session[s].random_vector, session[s].random_vector_length);
 


@@ -2009,7 +2061,9 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        n = orig_len;
                                }
 
                                        n = orig_len;
                                }
 

-                               LOG(4, s, t, "   AVP %d (%s) len %d\n", mtype, avp_name(mtype), n);
+                               LOG(4, s, t, "   AVP %d (%s) len %d%s%s\n", mtype, avp_name(mtype), n,
+                                       flags & 0x40 ? ", hidden" : "", flags & 0x80 ? ", mandatory" : "");
+

                                switch (mtype)
                                {
                                case 0:     // message type
                                switch (mtype)
                                {
                                case 0:     // message type


@@ -2071,14 +2125,14 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 //                                     LOG(4, s, t, "Firmware revision\n");
                                        break;
                                case 7:     // host name
 //                                     LOG(4, 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);
+                                       memset(tunnel[t].hostname, 0, sizeof(tunnel[t].hostname));
+                                       memcpy(tunnel[t].hostname, b, (n < sizeof(tunnel[t].hostname)) ? n : sizeof(tunnel[t].hostname) - 1);

                                        LOG(4, 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));
                                        LOG(4, 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);
+                                       memcpy(tunnel[t].vendor, b, (n < sizeof(tunnel[t].vendor)) ? n : sizeof(tunnel[t].vendor) - 1);

                                        LOG(4, s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
                                        break;
                                case 9:     // assigned tunnel
                                        LOG(4, s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
                                        break;
                                case 9:     // assigned tunnel


@@ -2118,13 +2172,13 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        // TBA
                                        break;
                                case 21:    // called number
                                        // TBA
                                        break;
                                case 21:    // called number

-                                       memset(called, 0, MAXTEL);
-                                       memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
+                                       memset(called, 0, sizeof(called));
+                                       memcpy(called, b, (n < sizeof(called)) ? n : sizeof(called) - 1);

                                        LOG(4, s, t, "   Called <%s>\n", called);
                                        break;
                                case 22:    // calling number
                                        LOG(4, s, t, "   Called <%s>\n", called);
                                        break;
                                case 22:    // calling number

-                                       memset(calling, 0, MAXTEL);
-                                       memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
+                                       memset(calling, 0, sizeof(calling));
+                                       memcpy(calling, b, (n < sizeof(calling)) ? n : sizeof(calling) - 1);

                                        LOG(4, s, t, "   Calling <%s>\n", calling);
                                        break;
                                case 23:    // subtype
                                        LOG(4, s, t, "   Calling <%s>\n", calling);
                                        break;
                                case 23:    // subtype


@@ -2137,8 +2191,9 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        else
                                        {
                                                // AS5300s send connect speed as a string
                                        else
                                        {
                                                // AS5300s send connect speed as a string

-                                               char tmp[30] = {0};
-                                               memcpy(tmp, b, (n >= 30) ? 30 : n);
+                                               char tmp[30];
+                                               memset(tmp, 0, sizeof(tmp));
+                                               memcpy(tmp, b, (n < sizeof(tmp)) ? n : sizeof(tmp) - 1);

                                                session[s].tx_connect_speed = atol(tmp);
                                        }
                                        LOG(4, s, t, "   TX connect speed <%u>\n", session[s].tx_connect_speed);
                                                session[s].tx_connect_speed = atol(tmp);
                                        }
                                        LOG(4, s, t, "   TX connect speed <%u>\n", session[s].tx_connect_speed);


@@ -2151,8 +2206,9 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        else
                                        {
                                                // AS5300s send connect speed as a string
                                        else
                                        {
                                                // AS5300s send connect speed as a string

-                                               char tmp[30] = {0};
-                                               memcpy(tmp, b, (n >= 30) ? 30 : n);
+                                               char tmp[30];
+                                               memset(tmp, 0, sizeof(tmp));
+                                               memcpy(tmp, b, (n < sizeof(tmp)) ? n : sizeof(tmp) - 1);

                                                session[s].rx_connect_speed = atol(tmp);
                                        }
                                        LOG(4, s, t, "   RX connect speed <%u>\n", session[s].rx_connect_speed);
                                                session[s].rx_connect_speed = atol(tmp);
                                        }
                                        LOG(4, s, t, "   RX connect speed <%u>\n", session[s].rx_connect_speed);


@@ -2167,47 +2223,51 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        {
                                                uint16_t atype = ntohs(*(uint16_t *)b);
                                                LOG(4, s, t, "   Proxy Auth Type %d (%s)\n", atype, auth_type(atype));
                                        {
                                                uint16_t atype = ntohs(*(uint16_t *)b);
                                                LOG(4, s, t, "   Proxy Auth Type %d (%s)\n", atype, auth_type(atype));

-                                               requestchap = (atype == 2);
+                                               if (atype == 2)
+                                                       authtype = AUTHCHAP;
+                                               else if (atype == 3)
+                                                       authtype = AUTHPAP;
+

                                                break;
                                        }
                                case 30:    // Proxy Authentication Name
                                        {
                                                break;
                                        }
                                case 30:    // Proxy Authentication Name
                                        {

-                                               char authname[64] = {0};
-                                               memcpy(authname, b, (n > 63) ? 63 : n);
+                                               char authname[64];
+                                               memset(authname, 0, sizeof(authname));
+                                               memcpy(authname, b, (n < sizeof(authname)) ? n : sizeof(authname) - 1);

                                                LOG(4, s, t, "   Proxy Auth Name (%s)\n",
                                                        authname);
                                                break;
                                        }
                                case 31:    // Proxy Authentication Challenge
                                        {
                                                LOG(4, s, t, "   Proxy Auth Name (%s)\n",
                                                        authname);
                                                break;
                                        }
                                case 31:    // Proxy Authentication Challenge
                                        {

-                                               memcpy(radius[session[s].radius].auth, b, 16);

                                                LOG(4, s, t, "   Proxy Auth Challenge\n");
                                                LOG(4, s, t, "   Proxy Auth Challenge\n");

+                                               if (sess_local[s].radius)
+                                                       memcpy(radius[sess_local[s].radius].auth, b, 16);

                                                break;
                                        }
                                case 32:    // Proxy Authentication ID
                                        {
                                                uint16_t authid = ntohs(*(uint16_t *)(b));
                                                LOG(4, s, t, "   Proxy Auth ID (%d)\n", authid);
                                                break;
                                        }
                                case 32:    // Proxy Authentication ID
                                        {
                                                uint16_t authid = ntohs(*(uint16_t *)(b));
                                                LOG(4, s, t, "   Proxy Auth ID (%d)\n", authid);

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

                                                break;
                                        }
                                case 33:    // Proxy Authentication Response
                                                break;
                                        }
                                case 33:    // Proxy Authentication Response

-                                       {
-                                               char authresp[64] = {0};
-                                               memcpy(authresp, b, (n > 63) ? 63 : n);
-                                               LOG(4, s, t, "   Proxy Auth Response\n");
-                                               break;
-                                       }
-                               case 27:    // last send lcp
+                                       LOG(4, s, t, "   Proxy Auth Response\n");
+                                       break;
+                               case 27:    // last sent lcp

                                        {        // find magic number
                                                uint8_t *p = b, *e = p + n;
                                                while (p + 1 < e && p[1] && p + p[1] <= e)
                                                {
                                                        if (*p == 5 && p[1] == 6) // Magic-Number
                                                                amagic = ntohl(*(uint32_t *) (p + 2));
                                        {        // find magic number
                                                uint8_t *p = b, *e = p + n;
                                                while (p + 1 < e && p[1] && p + p[1] <= e)
                                                {
                                                        if (*p == 5 && p[1] == 6) // Magic-Number
                                                                amagic = ntohl(*(uint32_t *) (p + 2));

-                                                       else if (*p == 3 && p[1] == 5 && *(uint16_t *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol
-                                                               chap = 1;
+                                                       else if (*p == 3 && p[1] == 4 && *(uint16_t *) (p + 2) == htons(PPPPAP)) // Authentication-Protocol (PAP)
+                                                               authtype = AUTHPAP;
+                                                       else if (*p == 3 && p[1] == 5 && *(uint16_t *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol (CHAP)
+                                                               authtype = AUTHCHAP;

                                                        else if (*p == 7) // Protocol-Field-Compression
                                                                aflags |= SESSIONPFC;
                                                        else if (*p == 8) // Address-and-Control-Field-Compression
                                                        else if (*p == 7) // Protocol-Field-Compression
                                                                aflags |= SESSIONPFC;
                                                        else if (*p == 8) // Address-and-Control-Field-Compression


@@ -2225,6 +2285,8 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                case 36:    // Random Vector
                                        LOG(4, s, t, "   Random Vector received.  Enabled AVP Hiding.\n");
                                        memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
                                case 36:    // Random Vector
                                        LOG(4, s, t, "   Random Vector received.  Enabled AVP Hiding.\n");
                                        memset(session[s].random_vector, 0, sizeof(session[s].random_vector));

+                                       if (n > sizeof(session[s].random_vector))
+                                               n = sizeof(session[s].random_vector);

                                        memcpy(session[s].random_vector, b, n);
                                        session[s].random_vector_length = n;
                                        break;
                                        memcpy(session[s].random_vector, b, n);
                                        session[s].random_vector_length = n;
                                        break;


@@ -2247,6 +2309,8 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                switch (message)
                                {
                                case 1:       // SCCRQ - Start Control Connection Request
                                switch (message)
                                {
                                case 1:       // SCCRQ - Start Control Connection Request

+                                       tunnel[t].state = TUNNELOPENING;
+                                       if (main_quit != QUIT_SHUTDOWN)

                                        {
                                                controlt *c = controlnew(2); // sending SCCRP
                                                control16(c, 2, version, 1); // protocol version
                                        {
                                                controlt *c = controlnew(2); // sending SCCRP
                                                control16(c, 2, version, 1); // protocol version


@@ -2254,9 +2318,12 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                                controls(c, 7, tunnel[t].hostname, 1); // host name (TBA)
                                                if (chapresponse) controlb(c, 13, chapresponse, 16, 1); // Challenge response
                                                control16(c, 9, t, 1); // assigned tunnel
                                                controls(c, 7, tunnel[t].hostname, 1); // host name (TBA)
                                                if (chapresponse) controlb(c, 13, chapresponse, 16, 1); // Challenge response
                                                control16(c, 9, t, 1); // assigned tunnel

-                                               controladd(c, t, s); // send the resply
+                                               controladd(c, t, 0); // send the resply
+                                       }
+                                       else
+                                       {
+                                               tunnelshutdown(t, "Shutting down", 6, 0, 0);

                                        }
                                        }

-                                       tunnel[t].state = TUNNELOPENING;

                                        break;
                                case 2:       // SCCRP
                                        tunnel[t].state = TUNNELOPEN;
                                        break;
                                case 2:       // SCCRP
                                        tunnel[t].state = TUNNELOPEN;


@@ -2282,16 +2349,9 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        // TBA
                                        break;
                                case 10:      // ICRQ
                                        // TBA
                                        break;
                                case 10:      // ICRQ

-                                       if (!sessionfree)
-                                       {
-                                               STAT(session_overflow);
-                                               LOG(1, 0, t, "No free sessions");
-                                               return;
-                                       }
-                                       else
+                                       if (sessionfree && main_quit != QUIT_SHUTDOWN)

                                        {
                                                uint16_t r;
                                        {
                                                uint16_t r;

-                                               controlt *c;

 
                                                s = sessionfree;
                                                sessionfree = session[s].next;
 
                                                s = sessionfree;
                                                sessionfree = session[s].next;


@@ -2301,31 +2361,44 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                                        config->cluster_highest_sessionid = s;
 
                                                // make a RADIUS session
                                                        config->cluster_highest_sessionid = s;
 
                                                // make a RADIUS session

-                                               if (!(r = radiusnew(s)))
+                                               if ((r = radiusnew(s)))

                                                {
                                                {

-                                                       LOG(1, s, t, "No free RADIUS sessions for ICRQ\n");
-                                                       sessionkill(s, "no free RADIUS sesions");
-                                                       return;
+                                                       controlt *c = controlnew(11); // sending ICRP
+                                                       session[s].opened = time_now;
+                                                       session[s].tunnel = t;
+                                                       session[s].far = asession;
+                                                       session[s].last_packet = time_now;
+                                                       LOG(3, s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+                                                       control16(c, 14, s, 1); // assigned session
+                                                       controladd(c, t, asession); // send the reply
+
+                                                       strncpy(radius[r].calling, calling, sizeof(radius[r].calling) - 1);
+                                                       strncpy(session[s].called, called, sizeof(session[s].called) - 1);
+                                                       strncpy(session[s].calling, calling, sizeof(session[s].calling) - 1);
+                                                       STAT(session_created);
+                                                       break;

                                                }
 
                                                }
 

-                                               c = controlnew(11); // sending ICRP
-                                               session[s].id = sessionid++;
-                                               session[s].opened = time_now;
-                                               session[s].tunnel = t;
-                                               session[s].far = asession;
-                                               session[s].last_packet = time_now;
-                                               LOG(3, 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
-
-                                               // Generate a random challenge
-                                               random_data(radius[r].auth, sizeof(radius[r].auth));
-                                               strncpy(radius[r].calling, calling, sizeof(radius[r].calling) - 1);
-                                               strncpy(session[s].called, called, sizeof(session[s].called) - 1);
-                                               strncpy(session[s].calling, calling, sizeof(session[s].calling) - 1);
-                                               STAT(session_created);
+
+                                               LOG(1, s, t, "No free RADIUS sessions for ICRQ\n");
+                                               sessionclear(s);

                                        }
                                        }

-                                       break;
+                                       else
+                                       {
+                                               STAT(session_overflow);
+                                               LOG(1, 0, t, "No free sessions\n");
+                                       }
+
+                                       {
+                                               controlt *c = controlnew(14); // CDN
+                                               if (main_quit == QUIT_SHUTDOWN)
+                                                       control16(c, 1, 2, 7); // try another
+                                               else
+                                                       control16(c, 1, 4, 0); // temporary lack of resources
+
+                                               controladd(c, t, asession); // send the message
+                                       }
+                                       return;

                                case 11:      // ICRP
                                        // TBA
                                        break;
                                case 11:      // ICRP
                                        // TBA
                                        break;


@@ -2335,13 +2408,16 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
                                        session[s].l2tp_flags = aflags; // set flags received
                                        LOG(3, s, t, "Magic %X Flags %X\n", amagic, aflags);
                                        controlnull(t); // ack
                                        session[s].l2tp_flags = aflags; // set flags received
                                        LOG(3, s, t, "Magic %X Flags %X\n", amagic, aflags);
                                        controlnull(t); // ack

-                                       // In CHAP state, request PAP instead
-                                       if (requestchap)
-                                               initlcp(t, s);
+                                       // proxy authentication type is not supported
+                                       if (!(config->radius_authtypes & authtype))
+                                               authtype = config->radius_authprefer;
+
+                                       // start LCP
+                                       sendlcp(t, s, authtype);

                                        break;
                                case 14:      // CDN
                                        controlnull(t); // ack
                                        break;
                                case 14:      // CDN
                                        controlnull(t); // ack

-                                       sessionshutdown(s, "Closed (Received CDN)");
+                                       sessionshutdown(s, "Closed (Received CDN).", 0, 0);

                                        break;
                                case 0xFFFF:
                                        LOG(1, s, t, "Missing message type\n");
                                        break;
                                case 0xFFFF:
                                        LOG(1, s, t, "Missing message type\n");


@@ -2522,42 +2598,61 @@ static void processtun(uint8_t * buf, int len)
        // Else discard.
 }
 
        // Else discard.
 }
 

-//
-// Maximum number of actions to complete.
-// This is to avoid sending out too many packets
-// at once.
-#define MAX_ACTIONS 500
-
-static int regular_cleanups(void)
+// Handle retries, timeouts.  Runs every 1/10th sec, want to ensure
+// that we look at the whole of the tunnel, radius and session tables
+// every second
+static void regular_cleanups(double period)

 {
 {

-       static sessionidt s = 0;        // Next session to check for actions on.
-       tunnelidt t;
-       int count=0,i;
-       uint16_t r;
-       static clockt next_acct = 0;
-       static clockt next_shut_acct = 0;
+       // Next tunnel, radius and session to check for actions on.
+       static tunnelidt t = 0;
+       static int r = 0;
+       static sessionidt s = 0;
+
+       int t_actions = 0;
+       int r_actions = 0;
+       int s_actions = 0;
+
+       int t_slice;
+       int r_slice;
+       int s_slice;
+
+       int i;

        int a;
 
        int a;
 

-       LOG(3, 0, 0, "Begin regular cleanup\n");
+       // divide up tables into slices based on the last run
+       t_slice = config->cluster_highest_tunnelid  * period;
+       r_slice = (MAXRADIUS - 1)                   * period;
+       s_slice = config->cluster_highest_sessionid * period;

 
 

-       for (r = 1; r < MAXRADIUS; r++)
-       {
-               if (!radius[r].state)
-                       continue;
-               if (radius[r].retry)
-               {
-                       if (radius[r].retry <= TIME)
-                               radiusretry(r);
-               } else
-                       radius[r].retry = backoff(radius[r].try+1);     // Is this really needed? --mo
-       }
-       for (t = 1; t <= config->cluster_highest_tunnelid; t++)
+       if (t_slice < 1)
+           t_slice = 1;
+       else if (t_slice > config->cluster_highest_tunnelid)
+           t_slice = config->cluster_highest_tunnelid;
+
+       if (r_slice < 1)
+           r_slice = 1;
+       else if (r_slice > (MAXRADIUS - 1))
+           r_slice = MAXRADIUS - 1;
+
+       if (s_slice < 1)
+           s_slice = 1;
+       else if (s_slice > config->cluster_highest_sessionid)
+           s_slice = config->cluster_highest_sessionid;
+
+       LOG(4, 0, 0, "Begin regular cleanup (last %f seconds ago)\n", period);
+
+       for (i = 0; i < t_slice; i++)

        {
        {

+               t++;
+               if (t > config->cluster_highest_tunnelid)
+                       t = 1;
+

                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)
                {
                        STAT(tunnel_timeout);
                        tunnelkill(t, "Expired");
                // check for expired tunnels
                if (tunnel[t].die && tunnel[t].die <= TIME)
                {
                        STAT(tunnel_timeout);
                        tunnelkill(t, "Expired");

+                       t_actions++;

                        continue;
                }
                // check for message resend
                        continue;
                }
                // check for message resend


@@ -2577,6 +2672,8 @@ static int regular_cleanups(void)
                                                tunnelsend(c->buf, c->length, t);
                                                c = c->next;
                                        }
                                                tunnelsend(c->buf, c->length, t);
                                                c = c->next;
                                        }

+
+                               t_actions++;

                        }
                }
                // Send hello
                        }
                }
                // Send hello


@@ -2585,6 +2682,7 @@ static int regular_cleanups(void)
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, t, 0); // send the message
                        LOG(3, 0, t, "Sending HELLO message\n");
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, t, 0); // send the message
                        LOG(3, 0, t, "Sending HELLO message\n");

+                       t_actions++;

                }
 
                // Check for tunnel changes requested from the CLI
                }
 
                // Check for tunnel changes requested from the CLI


@@ -2595,13 +2693,28 @@ static int regular_cleanups(void)
                        {
                                LOG(2, 0, t, "Dropping tunnel by CLI\n");
                                tunnelshutdown(t, "Requested by administrator", 1, 0, 0);
                        {
                                LOG(2, 0, t, "Dropping tunnel by CLI\n");
                                tunnelshutdown(t, "Requested by administrator", 1, 0, 0);

+                               t_actions++;

                        }
                }
                        }
                }

+       }
+
+       for (i = 0; i < r_slice; i++)
+       {
+               r++;
+               if (r >= MAXRADIUS)
+                       r = 1;
+
+               if (!radius[r].state)
+                       continue;

 
 

+               if (radius[r].retry <= TIME)
+               {
+                       radiusretry(r);
+                       r_actions++;
+               }

        }
 
        }
 

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

        {
                s++;
                if (s > config->cluster_highest_sessionid)
        {
                s++;
                if (s > config->cluster_highest_sessionid)


@@ -2610,31 +2723,36 @@ static int regular_cleanups(void)
                if (!session[s].opened) // Session isn't in use
                        continue;
 
                if (!session[s].opened) // Session isn't in use
                        continue;
 

-               if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
+               // check for expired sessions
+               if (session[s].die)

                {
                {

-                       // IPCP has not completed yet. Resend
-                       LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
-                       sendipcp(session[s].tunnel, s);
+                       if (session[s].die <= TIME)
+                       {
+                               sessionkill(s, "Expired");
+                               s_actions++;
+                       }
+                       continue;

                }
 
                }
 

-               // check for expired sessions
-               if (session[s].die && session[s].die <= TIME)
+               if (session[s].ip && !(session[s].flags & SF_IPCP_ACKED)
+                   && !(sess_local[s].radius && radius[sess_local[s].radius].state == RADIUSIPCP))

                {
                {

-                       sessionkill(s, "Expired");
-                       if (++count >= MAX_ACTIONS) break;
-                       continue;
+                       // IPCP has not completed yet. Resend
+                       LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
+                       sendipcp(session[s].tunnel, s);
+                       s_actions++;

                }
 
                // Drop sessions who have not responded within IDLE_TIMEOUT seconds
                if (session[s].last_packet && (time_now - session[s].last_packet >= IDLE_TIMEOUT))
                {
                }
 
                // Drop sessions who have not responded within IDLE_TIMEOUT seconds
                if (session[s].last_packet && (time_now - session[s].last_packet >= IDLE_TIMEOUT))
                {

-                       sessionshutdown(s, "No response to LCP ECHO requests");
+                       sessionshutdown(s, "No response to LCP ECHO requests.", 3, 0);

                        STAT(session_timeout);
                        STAT(session_timeout);

-                       if (++count >= MAX_ACTIONS) break;
+                       s_actions++;

                        continue;
                }
 
                        continue;
                }
 

-               // No data in IDLE_TIMEOUT seconds, send LCP ECHO
+               // No data in ECHO_TIMEOUT seconds, send LCP ECHO

                if (session[s].user[0] && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
                {
                        uint8_t b[MAXCONTROL] = {0};
                if (session[s].user[0] && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
                {
                        uint8_t b[MAXCONTROL] = {0};


@@ -2650,7 +2768,7 @@ static int regular_cleanups(void)
                        LOG(4, 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
                        LOG(4, 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;
+                       s_actions++;

                }
 
                // Check for actions requested from the CLI
                }
 
                // Check for actions requested from the CLI


@@ -2662,8 +2780,9 @@ static int regular_cleanups(void)
                        if (a & CLI_SESS_KILL)
                        {
                                LOG(2, s, session[s].tunnel, "Dropping session by CLI\n");
                        if (a & CLI_SESS_KILL)
                        {
                                LOG(2, s, session[s].tunnel, "Dropping session by CLI\n");

-                               sessionshutdown(s, "Requested by administrator");
+                               sessionshutdown(s, "Requested by administrator.", 3, 0);

                                a = 0; // dead, no need to check for other actions
                                a = 0; // dead, no need to check for other actions

+                               s_actions++;

                        }
 
                        if (a & CLI_SESS_NOSNOOP)
                        }
 
                        if (a & CLI_SESS_NOSNOOP)


@@ -2671,6 +2790,7 @@ static int regular_cleanups(void)
                                LOG(2, s, session[s].tunnel, "Unsnooping session by CLI\n");
                                session[s].snoop_ip = 0;
                                session[s].snoop_port = 0;
                                LOG(2, s, session[s].tunnel, "Unsnooping session by CLI\n");
                                session[s].snoop_ip = 0;
                                session[s].snoop_port = 0;

+                               s_actions++;

                                send++;
                        }
                        else if (a & CLI_SESS_SNOOP)
                                send++;
                        }
                        else if (a & CLI_SESS_SNOOP)


@@ -2681,6 +2801,7 @@ static int regular_cleanups(void)
 
                                session[s].snoop_ip = cli_session_actions[s].snoop_ip;
                                session[s].snoop_port = cli_session_actions[s].snoop_port;
 
                                session[s].snoop_ip = cli_session_actions[s].snoop_ip;
                                session[s].snoop_port = cli_session_actions[s].snoop_port;

+                               s_actions++;

                                send++;
                        }
 
                                send++;
                        }
 


@@ -2688,6 +2809,7 @@ static int regular_cleanups(void)
                        {
                                LOG(2, s, session[s].tunnel, "Un-throttling session by CLI\n");
                                throttle_session(s, 0, 0);
                        {
                                LOG(2, s, session[s].tunnel, "Un-throttling session by CLI\n");
                                throttle_session(s, 0, 0);

+                               s_actions++;

                                send++;
                        }
                        else if (a & CLI_SESS_THROTTLE)
                                send++;
                        }
                        else if (a & CLI_SESS_THROTTLE)


@@ -2697,6 +2819,7 @@ static int regular_cleanups(void)
                                    cli_session_actions[s].throttle_out);
 
                                throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);
                                    cli_session_actions[s].throttle_out);
 
                                throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);

+                               s_actions++;

                                send++;
                        }
 
                                send++;
                        }
 


@@ -2704,6 +2827,7 @@ static int regular_cleanups(void)
                        {
                                LOG(2, s, session[s].tunnel, "Un-filtering session by CLI\n");
                                filter_session(s, 0, 0);
                        {
                                LOG(2, s, session[s].tunnel, "Un-filtering session by CLI\n");
                                filter_session(s, 0, 0);

+                               s_actions++;

                                send++;
                        }
                        else if (a & CLI_SESS_FILTER)
                                send++;
                        }
                        else if (a & CLI_SESS_FILTER)


@@ -2713,42 +2837,41 @@ static int regular_cleanups(void)
                                    cli_session_actions[s].filter_out);
 
                                filter_session(s, cli_session_actions[s].filter_in, cli_session_actions[s].filter_out);
                                    cli_session_actions[s].filter_out);
 
                                filter_session(s, cli_session_actions[s].filter_in, cli_session_actions[s].filter_out);

+                               s_actions++;

                                send++;
                        }
 
                        if (send)
                                cluster_send_session(s);
                                send++;
                        }
 
                        if (send)
                                cluster_send_session(s);

-
-                       if (++count >= MAX_ACTIONS) break;

                }
                }

-       }

 
 

-       if (*config->accounting_dir)
-       {
-               if (next_acct <= TIME)
+               // RADIUS interim accounting
+               if (config->radius_accounting && config->radius_interim > 0
+                   && session[s].ip && !session[s].walled_garden
+                   && !sess_local[s].radius // RADIUS already in progress
+                   && time_now - sess_local[s].last_interim >= config->radius_interim)

                {
                {

-                       // Dump accounting data
-                       next_acct = TIME + ACCT_TIME;
-                       next_shut_acct = TIME + ACCT_SHUT_TIME;
-                       dump_acct_info(1);
-               }
-               else if (next_shut_acct <= TIME)
-               {
-                       // Dump accounting data for shutdown sessions
-                       next_shut_acct = TIME + ACCT_SHUT_TIME;
-                       if (shut_acct_n)
-                               dump_acct_info(0);
+                       int rad = radiusnew(s);
+                       if (!rad)
+                       {
+                               LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Interim message\n");
+                               STAT(radius_overflow);
+                               continue;
+                       }
+
+                       LOG(3, s, session[s].tunnel, "Sending RADIUS Interim for %s (%u)\n",
+                               session[s].user, session[s].unique_id);
+
+                       radiussend(rad, RADIUSINTERIM);
+                       sess_local[s].last_interim = time_now;
+                       s_actions++;

                }
        }
 
                }
        }
 

-       if (count >= MAX_ACTIONS)
-               return 1;       // Didn't finish!
-
-       LOG(3, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
-       return 0;
+       LOG(4, 0, 0, "End regular cleanup: checked %d/%d/%d tunnels/radius/sessions; %d/%d/%d actions\n",
+               t_slice, r_slice, s_slice, t_actions, r_actions, s_actions);

 }
 
 }
 

-

 //
 // Are we in the middle of a tunnel update, or radius
 // requests??
 //
 // Are we in the middle of a tunnel update, or radius
 // requests??


@@ -2758,6 +2881,53 @@ static int still_busy(void)
        int i;
        static clockt last_talked = 0;
        static clockt start_busy_wait = 0;
        int i;
        static clockt last_talked = 0;
        static clockt start_busy_wait = 0;

+
+       if (!config->cluster_iam_master)
+       {
+#ifdef BGP
+               static time_t stopped_bgp = 0;
+               if (bgp_configured)
+               {
+                       if (!stopped_bgp)
+                       {
+                               LOG(1, 0, 0, "Shutting down in %d seconds, stopping BGP...\n", QUIT_DELAY);
+
+                               for (i = 0; i < BGP_NUM_PEERS; i++)
+                                       if (bgp_peers[i].state == Established)
+                                               bgp_stop(&bgp_peers[i]);
+
+                               stopped_bgp = time_now;
+
+                               // we don't want to become master
+                               cluster_send_ping(0);
+
+                               return 1;
+                       }
+
+                       if (time_now < (stopped_bgp + QUIT_DELAY))
+                               return 1;
+               }
+#endif /* BGP */
+
+               return 0;
+       }
+
+       if (main_quit == QUIT_SHUTDOWN)
+       {
+               static int dropped = 0;
+               if (!dropped)
+               {
+                       int i;
+
+                       LOG(1, 0, 0, "Dropping sessions and tunnels\n");
+                       for (i = 1; i < MAXTUNNEL; i++)
+                               if (tunnel[i].ip || tunnel[i].state)
+                                       tunnelshutdown(i, "L2TPNS Closing", 6, 0, 0);
+
+                       dropped = 1;
+               }
+       }
+

        if (start_busy_wait == 0)
                start_busy_wait = TIME;
 
        if (start_busy_wait == 0)
                start_busy_wait = TIME;
 


@@ -2799,80 +2969,108 @@ static int still_busy(void)
        return 0;
 }
 
        return 0;
 }
 

-static fd_set readset;
-static int readset_n = 0;
+#ifdef HAVE_EPOLL
+# include <sys/epoll.h>
+#else
+# define FAKE_EPOLL_IMPLEMENTATION /* include the functions */
+# include "fake_epoll.h"
+#endif
+
+// the base set of fds polled: cli, cluster, tun, udp, control, dae
+#define BASE_FDS       6
+
+// additional polled fds
+#ifdef BGP
+# define EXTRA_FDS     BGP_NUM_PEERS
+#else
+# define EXTRA_FDS     0
+#endif

 
 // main loop - gets packets on tun or udp and processes them
 static void mainloop(void)
 {
        int i;
        uint8_t buf[65536];
 
 // main loop - gets packets on tun or udp and processes them
 static void mainloop(void)
 {
        int i;
        uint8_t buf[65536];

-       struct timeval to;

        clockt next_cluster_ping = 0;   // send initial ping immediately
        clockt next_cluster_ping = 0;   // send initial ping immediately

-       time_t next_clean = time_now + config->cleanup_interval;
-
-       LOG(4, 0, 0, "Beginning of main loop.  udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
-               udpfd, tunfd, cluster_sockfd, controlfd);
-
-       FD_ZERO(&readset);
-       FD_SET(udpfd, &readset);
-       FD_SET(tunfd, &readset);
-       FD_SET(controlfd, &readset);
-       FD_SET(clifd, &readset);
-       if (cluster_sockfd) FD_SET(cluster_sockfd, &readset);
-       readset_n = udpfd;
-       if (tunfd > readset_n)          readset_n = tunfd;
-       if (controlfd > readset_n)      readset_n = controlfd;
-       if (clifd > readset_n)          readset_n = clifd;
-       if (cluster_sockfd > readset_n) readset_n = cluster_sockfd;
+       struct epoll_event events[BASE_FDS + RADIUS_FDS + EXTRA_FDS];
+       int maxevent = sizeof(events)/sizeof(*events);

 
 

-       while (!main_quit || still_busy())
+       if ((epollfd = epoll_create(maxevent)) < 0)
+       {
+               LOG(0, 0, 0, "epoll_create failed: %s\n", strerror(errno));
+               exit(1);
+       }
+
+       LOG(4, 0, 0, "Beginning of main loop.  clifd=%d, cluster_sockfd=%d, tunfd=%d, udpfd=%d, controlfd=%d, daefd=%d\n",
+               clifd, cluster_sockfd, tunfd, udpfd, controlfd, daefd);
+
+       /* setup our fds to poll for input */

        {
        {

-               fd_set r;
-               int n = readset_n;
+               static struct event_data d[BASE_FDS];
+               struct epoll_event e;
+
+               e.events = EPOLLIN;
+               i = 0;
+
+               d[i].type = FD_TYPE_CLI;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, clifd, &e);
+
+               d[i].type = FD_TYPE_CLUSTER;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, cluster_sockfd, &e);
+
+               d[i].type = FD_TYPE_TUN;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, tunfd, &e);
+
+               d[i].type = FD_TYPE_UDP;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, udpfd, &e);
+
+               d[i].type = FD_TYPE_CONTROL;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, controlfd, &e);
+
+               d[i].type = FD_TYPE_DAE;
+               e.data.ptr = &d[i++];
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, daefd, &e);
+       }
+

 #ifdef BGP
 #ifdef BGP

-               fd_set w;
-               int bgp_set[BGP_NUM_PEERS];
+       signal(SIGPIPE, SIG_IGN);
+       bgp_setup(config->as_number);
+       if (config->bind_address)
+               bgp_add_route(config->bind_address, 0xffffffff);
+
+       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 */
 
 #endif /* BGP */
 

+       while (!main_quit || still_busy())
+       {
+               int more = 0;
+               int n;
+

                if (config->reload_config)
                {
                        // Update the config state based on config settings
                        update_config();
                }
 
                if (config->reload_config)
                {
                        // Update the config state based on config settings
                        update_config();
                }
 

-               memcpy(&r, &readset, sizeof(fd_set));
-               to.tv_sec = 0;
-               to.tv_usec = 100000; // 1/10th of a second.
-

 #ifdef BGP
 #ifdef BGP

-               FD_ZERO(&w);
-               for (i = 0; i < BGP_NUM_PEERS; i++)
-               {
-                       bgp_set[i] = bgp_select_state(&bgp_peers[i]);
-                       if (bgp_set[i] & 1)
-                       {
-                               FD_SET(bgp_peers[i].sock, &r);
-                               if (bgp_peers[i].sock > n)
-                                       n = bgp_peers[i].sock;
-                       }
-
-                       if (bgp_set[i] & 2)
-                       {
-                               FD_SET(bgp_peers[i].sock, &w);
-                               if (bgp_peers[i].sock > n)
-                                       n = bgp_peers[i].sock;
-                       }
-               }
-
-               n = select(n + 1, &r, &w, 0, &to);
-#else /* BGP */
-               n = select(n + 1, &r, 0, 0, &to);
+               bgp_set_poll();

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

+               n = epoll_wait(epollfd, events, maxevent, 100); // timeout 100ms (1/10th sec)

                STAT(select_called);
 
                STAT(select_called);
 

-               TIME = now();
+               TIME = now(NULL);

                if (n < 0)
                {
                        if (errno == EINTR ||
                if (n < 0)
                {
                        if (errno == EINTR ||


@@ -2880,70 +3078,91 @@ static void mainloop(void)
                                continue;
 
                        LOG(0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
                                continue;
 
                        LOG(0, 0, 0, "Error returned from select(): %s\n", strerror(errno));

-                       main_quit++;
-                       break;
+                       break; // exit

                }
                }

-               else if (n)
+
+               if (n)

                {
                        struct sockaddr_in addr;
                        int alen, c, s;
                {
                        struct sockaddr_in addr;
                        int alen, c, s;

+                       int udp_ready = 0;
+                       int tun_ready = 0;
+                       int cluster_ready = 0;

                        int udp_pkts = 0;
                        int tun_pkts = 0;
                        int cluster_pkts = 0;
                        int udp_pkts = 0;
                        int tun_pkts = 0;
                        int cluster_pkts = 0;

+#ifdef BGP
+                       uint32_t bgp_events[BGP_NUM_PEERS];
+                       memset(bgp_events, 0, sizeof(bgp_events));
+#endif /* BGP */

 
 

-                       // nsctl commands
-                       if (FD_ISSET(controlfd, &r))
-                       {
-                               alen = sizeof(addr);
-                               processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr, alen);
-                               n--;
-                       }
-
-                       // RADIUS responses
-                       if (config->cluster_iam_master)
+                       for (c = n, i = 0; i < c; i++)

                        {
                        {

-                               for (i = 0; i < config->num_radfds; i++)
+                               struct event_data *d = events[i].data.ptr;
+                               switch (d->type)
+                               {
+                               case FD_TYPE_CLI: // CLI connections

                                {
                                {

-                                       if (FD_ISSET(radfds[i], &r))
+                                       int cli;
+                                       
+                                       alen = sizeof(addr);
+                                       if ((cli = accept(clifd, (struct sockaddr *)&addr, &alen)) >= 0)

                                        {
                                        {

-                                               processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
-                                               n--;
+                                               cli_do(cli);
+                                               close(cli);

                                        }
                                        }

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

 
 

-                       // CLI connections
-                       if (FD_ISSET(clifd, &r))
-                       {
-                               int cli;
-                               
-                               alen = sizeof(addr);
-                               if ((cli = accept(clifd, (struct sockaddr *)&addr, &alen)) >= 0)
-                               {
-                                       cli_do(cli);
-                                       close(cli);
+                                       n--;
+                                       break;

                                }
                                }

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

 
 

-                               n--;
-                       }
+                               // these are handled below, with multiple interleaved reads
+                               case FD_TYPE_CLUSTER:   cluster_ready++; break;
+                               case FD_TYPE_TUN:       tun_ready++; break;
+                               case FD_TYPE_UDP:       udp_ready++; break;
+
+                               case FD_TYPE_CONTROL: // nsctl commands
+                                       alen = sizeof(addr);
+                                       processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr, alen);
+                                       n--;
+                                       break;
+
+                               case FD_TYPE_DAE: // DAE requests
+                                       alen = sizeof(addr);
+                                       processdae(buf, recvfrom(daefd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr, alen);
+                                       n--;
+                                       break;
+
+                               case FD_TYPE_RADIUS: // RADIUS response
+                                       s = recv(radfds[d->index], buf, sizeof(buf), 0);
+                                       if (s >= 0 && config->cluster_iam_master)
+                                               processrad(buf, s, d->index);
+
+                                       n--;
+                                       break;

 
 #ifdef BGP
 
 #ifdef BGP

-                       for (i = 0; i < BGP_NUM_PEERS; i++)
-                       {
-                               int isr = bgp_set[i] ? FD_ISSET(bgp_peers[i].sock, &r) : 0;
-                               int isw = bgp_set[i] ? FD_ISSET(bgp_peers[i].sock, &w) : 0;
-                               bgp_process(&bgp_peers[i], isr, isw);
-                               if (isr) n--;
-                               if (isw) n--;
+                               case FD_TYPE_BGP:
+                                       bgp_events[d->index] = events[i].events;
+                                       n--;
+                                       break;
+#endif /* BGP */
+
+                               default:
+                                       LOG(0, 0, 0, "Unexpected fd type returned from epoll_wait: %d\n", d->type);
+                               }

                        }
                        }

+
+#ifdef BGP
+                       bgp_process(bgp_events);

 #endif /* BGP */
 
                        for (c = 0; n && c < config->multi_read_count; c++)
                        {
                                // L2TP
 #endif /* BGP */
 
                        for (c = 0; n && c < config->multi_read_count; c++)
                        {
                                // L2TP

-                               if (FD_ISSET(udpfd, &r))
+                               if (udp_ready)

                                {
                                        alen = sizeof(addr);
                                        if ((s = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
                                {
                                        alen = sizeof(addr);
                                        if ((s = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)


@@ -2953,13 +3172,13 @@ static void mainloop(void)
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {

-                                               FD_CLR(udpfd, &r);
+                                               udp_ready = 0;

                                                n--;
                                        }
                                }
 
                                // incoming IP
                                                n--;
                                        }
                                }
 
                                // incoming IP

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

                                {
                                        if ((s = read(tunfd, buf, sizeof(buf))) > 0)
                                        {
                                {
                                        if ((s = read(tunfd, buf, sizeof(buf))) > 0)
                                        {


@@ -2968,13 +3187,13 @@ static void mainloop(void)
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {

-                                               FD_CLR(tunfd, &r);
+                                               tun_ready = 0;

                                                n--;
                                        }
                                }
 
                                // cluster
                                                n--;
                                        }
                                }
 
                                // cluster

-                               if (FD_ISSET(cluster_sockfd, &r))
+                               if (cluster_ready)

                                {
                                        alen = sizeof(addr);
                                        if ((s = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen)) > 0)
                                {
                                        alen = sizeof(addr);
                                        if ((s = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen)) > 0)


@@ -2984,7 +3203,7 @@ static void mainloop(void)
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {

-                                               FD_CLR(cluster_sockfd, &r);
+                                               cluster_ready = 0;

                                                n--;
                                        }
                                }
                                                n--;
                                        }
                                }


@@ -2999,11 +3218,12 @@ static void mainloop(void)
                                        config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts);
 
                                STAT(multi_read_exceeded);
                                        config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts);
 
                                STAT(multi_read_exceeded);

+                               more++;

                        }
                }
 
                        // Runs on every machine (master and slaves).
                        }
                }
 
                        // Runs on every machine (master and slaves).

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

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


@@ -3021,9 +3241,11 @@ static void mainloop(void)
                                next_cluster_ping = TIME + config->cluster_hb_interval;
                }
 
                                next_cluster_ping = TIME + config->cluster_hb_interval;
                }
 

+               if (!config->cluster_iam_master)
+                       continue;
+

                        // Run token bucket filtering queue..
                        // Only run it every 1/10th of a second.
                        // Run token bucket filtering queue..
                        // Only run it every 1/10th of a second.

-                       // Runs on all machines both master and slave.

                {
                        static clockt last_run = 0;
                        if (last_run != TIME)
                {
                        static clockt last_run = 0;
                        if (last_run != TIME)


@@ -3033,20 +3255,42 @@ static void mainloop(void)
                        }
                }
 
                        }
                }
 

-               /* Handle timeouts. Make sure that this gets run anyway, even if there was
-                * something to read, else under load this will never actually run....
-                *
-                */
-               if (config->cluster_iam_master && next_clean <= time_now)
+                       // Handle timeouts, retries etc.

                {
                {

-                       if (regular_cleanups())
+                       static double last_clean = 0;
+                       double this_clean;
+                       double diff;
+
+                       TIME = now(&this_clean);
+                       diff = this_clean - last_clean;
+
+                       // Run during idle time (after we've handled
+                       // all incoming packets) or every 1/10th sec
+                       if (!more || diff > 0.1)

                        {
                        {

-                               // Did it finish?
-                               next_clean = time_now + 1 ;     // Didn't finish. Check quickly.
+                               regular_cleanups(diff);
+                               last_clean = this_clean;

                        }
                        }

-                       else
+               }
+
+               if (*config->accounting_dir)
+               {
+                       static clockt next_acct = 0;
+                       static clockt next_shut_acct = 0;
+
+                       if (next_acct <= TIME)
+                       {
+                               // Dump accounting data
+                               next_acct = TIME + ACCT_TIME;
+                               next_shut_acct = TIME + ACCT_SHUT_TIME;
+                               dump_acct_info(1);
+                       }
+                       else if (next_shut_acct <= TIME)

                        {
                        {

-                               next_clean = time_now + config->cleanup_interval; // Did. Move to next interval.
+                               // Dump accounting data for shutdown sessions
+                               next_shut_acct = TIME + ACCT_SHUT_TIME;
+                               if (shut_acct_n)
+                                       dump_acct_info(0);

                        }
                }
        }
                        }
                }
        }


@@ -3061,6 +3305,7 @@ static void mainloop(void)
 
        //
        // Important!!! We MUST not process any packets past this point!
 
        //
        // Important!!! We MUST not process any packets past this point!

+       LOG(1, 0, 0, "Shutdown complete\n");

 }
 
 static void stripdomain(char *host)
 }
 
 static void stripdomain(char *host)


@@ -3133,24 +3378,37 @@ static void initdata(int optdebug, char *optconfig)
 {
        int i;
 
 {
        int i;
 

-       if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
-       {
-               LOG(0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
-               exit(1);
-       }

        if (!(config = shared_malloc(sizeof(configt))))
        {
        if (!(config = shared_malloc(sizeof(configt))))
        {

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

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

+

        memset(config, 0, sizeof(configt));
        time(&config->start_time);
        strncpy(config->config_file, optconfig, strlen(optconfig));
        config->debug = optdebug;
        config->num_tbfs = MAXTBFS;
        config->rl_rate = 28; // 28kbps
        memset(config, 0, sizeof(configt));
        time(&config->start_time);
        strncpy(config->config_file, optconfig, strlen(optconfig));
        config->debug = optdebug;
        config->num_tbfs = MAXTBFS;
        config->rl_rate = 28; // 28kbps

+       config->cluster_master_min_adv = 1;

        strcpy(config->random_device, RANDOMDEVICE);
 
        strcpy(config->random_device, RANDOMDEVICE);
 

+       log_stream = stderr;
+
+#ifdef RINGBUFFER
+       if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
+       {
+               LOG(0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
+               exit(1);
+       }
+       memset(ringbuffer, 0, sizeof(struct Tringbuffer));
+#endif
+
+       if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
+       {
+               LOG(0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
+               exit(1);
+       }

        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                LOG(0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
        if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
        {
                LOG(0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));


@@ -3187,15 +3445,6 @@ static void initdata(int optdebug, char *optconfig)
        }
        memset(ip_filters, 0, sizeof(ip_filtert) * MAXFILTER);
 
        }
        memset(ip_filters, 0, sizeof(ip_filtert) * MAXFILTER);
 

-#ifdef RINGBUFFER
-       if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
-       {
-               LOG(0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
-               exit(1);
-       }
-       memset(ringbuffer, 0, sizeof(struct Tringbuffer));
-#endif
-

        if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
        {
                LOG(0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
        if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
        {
                LOG(0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));


@@ -3531,7 +3780,7 @@ void snoop_send_packet(char *packet, uint16_t size, in_addr_t destination, uint1
 
 static int dump_session(FILE **f, sessiont *s)
 {
 
 static int dump_session(FILE **f, sessiont *s)
 {

-       if (!s->opened || !s->ip || !(s->cin || s->cout) || !*s->user || s->walled_garden)
+       if (!s->opened || !s->ip || !(s->cin_delta || s->cout_delta) || !*s->user || s->walled_garden)

                return 1;
 
        if (!*f)
                return 1;
 
        if (!*f)


@@ -3552,10 +3801,12 @@ static int dump_session(FILE **f, sessiont *s)
                LOG(3, 0, 0, "Dumping accounting information to %s\n", filename);
                fprintf(*f, "# dslwatch.pl dump file V1.01\n"
                        "# host: %s\n"
                LOG(3, 0, 0, "Dumping accounting information to %s\n", filename);
                fprintf(*f, "# dslwatch.pl dump file V1.01\n"
                        "# host: %s\n"

+                       "# endpoint: %s\n"

                        "# time: %ld\n"
                        "# uptime: %ld\n"
                        "# format: username ip qos uptxoctets downrxoctets\n",
                        hostname,
                        "# time: %ld\n"
                        "# uptime: %ld\n"
                        "# format: username ip qos uptxoctets downrxoctets\n",
                        hostname,

+                       fmtaddr(config->bind_address ? config->bind_address : my_address, 0),

                        now,
                        now - basetime);
        }
                        now,
                        now - basetime);
        }


@@ -3565,11 +3816,10 @@ static int dump_session(FILE **f, sessiont *s)
                s->user,                                                // username
                fmtaddr(htonl(s->ip), 0),                               // ip
                (s->throttle_in || s->throttle_out) ? 2 : 1,            // qos
                s->user,                                                // username
                fmtaddr(htonl(s->ip), 0),                               // ip
                (s->throttle_in || s->throttle_out) ? 2 : 1,            // qos

-               (uint32_t) s->cin,                                      // uptxoctets
-               (uint32_t) s->cout);                                    // downrxoctets
+               (uint32_t) s->cin_delta,                                // uptxoctets
+               (uint32_t) s->cout_delta);                              // downrxoctets

 
 

-       s->pin = s->cin = 0;
-       s->pout = s->cout = 0;
+       s->cin_delta = s->cout_delta = 0;

 
        return 1;
 }
 
        return 1;
 }


@@ -3697,19 +3947,6 @@ int main(int argc, char *argv[])
        if (cluster_init() < 0)
                exit(1);
 
        if (cluster_init() < 0)
                exit(1);
 

-#ifdef BGP
-       signal(SIGPIPE, SIG_IGN);
-       bgp_setup(config->as_number);
-       bgp_add_route(config->bind_address, 0xffffffff);
-       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();
        LOG(1, 0, 0, "Set up on interface %s\n", config->tundevice);
 
        inittun();
        LOG(1, 0, 0, "Set up on interface %s\n", config->tundevice);
 


@@ -3717,11 +3954,18 @@ int main(int argc, char *argv[])
        initrad();
        initippool();
 
        initrad();
        initippool();
 

-       signal(SIGHUP, sighup_handler);
-       signal(SIGTERM, sigterm_handler);
-       signal(SIGINT, sigterm_handler);
-       signal(SIGQUIT, sigquit_handler);
+       // seed prng
+       {
+               unsigned seed = time_now ^ getpid();
+               LOG(4, 0, 0, "Seeding the pseudo random generator: %u\n", seed);
+               srand(seed);
+       }
+
+       signal(SIGHUP,  sighup_handler);

        signal(SIGCHLD, sigchild_handler);
        signal(SIGCHLD, sigchild_handler);

+       signal(SIGTERM, shutdown_handler);
+       signal(SIGINT,  shutdown_handler);
+       signal(SIGQUIT, shutdown_handler);

 
        // Prevent us from getting paged out
        if (config->lock_pages)
 
        // Prevent us from getting paged out
        if (config->lock_pages)


@@ -3740,14 +3984,6 @@ int main(int argc, char *argv[])
 
        mainloop();
 
 
        mainloop();
 

-#ifdef BGP
-       /* try to shut BGP down cleanly; with luck the sockets will be
-          writable since we're out of the select */
-       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();
 
        /* remove plugins (so cleanup code gets run) */
        plugins_done();
 


@@ -3763,9 +3999,11 @@ int main(int argc, char *argv[])
 
 static void sighup_handler(int sig)
 {
 
 static void sighup_handler(int sig)
 {

-       if (log_stream && log_stream != stderr)
+       if (log_stream)

        {
        {

-               fclose(log_stream);
+               if (log_stream != stderr)
+                       fclose(log_stream);
+

                log_stream = NULL;
        }
 
                log_stream = NULL;
        }
 


@@ -3805,33 +4043,10 @@ static void sigalrm_handler(int sig)
 
 }
 
 
 }
 

-static void sigterm_handler(int sig)
-{
-       LOG(1, 0, 0, "Shutting down cleanly\n");
-       main_quit++;
-}
-
-static void sigquit_handler(int sig)
+static void shutdown_handler(int sig)

 {
 {

-       int i;
-
-       LOG(1, 0, 0, "Shutting down without saving sessions\n");
-
-       if (config->cluster_iam_master)
-       {
-               for (i = 1; i < MAXSESSION; i++)
-               {
-                       if (session[i].opened)
-                               sessionkill(i, "L2TPNS Closing");
-               }
-               for (i = 1; i < MAXTUNNEL; i++)
-               {
-                       if (tunnel[i].ip || tunnel[i].state)
-                               tunnelshutdown(i, "L2TPNS Closing", 6, 0, 0);
-               }
-       }
-
-       main_quit++;
+       LOG(1, 0, 0, "Shutting down\n");
+       main_quit = (sig == SIGQUIT) ? QUIT_SHUTDOWN : QUIT_FAILOVER;

 }
 
 static void sigchild_handler(int sig)
 }
 
 static void sigchild_handler(int sig)


@@ -3887,7 +4102,9 @@ static void update_config()
        syslog_log = 0;
        if (log_stream)
        {
        syslog_log = 0;
        if (log_stream)
        {

-               fclose(log_stream);
+               if (log_stream != stderr)
+                       fclose(log_stream);
+

                log_stream = NULL;
        }
 
                log_stream = NULL;
        }
 


@@ -3935,7 +4152,7 @@ static void update_config()
                        // test twice, In case someone works with
                        // a secondary radius server without defining
                        // a primary one, this will work even then.
                        // 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])
+                       if (i > 0 && !config->radiusport[i])

                                config->radiusport[i] = config->radiusport[i-1];
                        if (!config->radiusport[i])
                                config->radiusport[i] = RADPORT;
                                config->radiusport[i] = config->radiusport[i-1];
                        if (!config->radiusport[i])
                                config->radiusport[i] = RADPORT;


@@ -3944,12 +4161,10 @@ static void update_config()
        if (!config->numradiusservers)
                LOG(0, 0, 0, "No RADIUS servers defined!\n");
 
        if (!config->numradiusservers)
                LOG(0, 0, 0, "No RADIUS servers defined!\n");
 

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

        // parse radius_authtypes_s
        config->radius_authtypes = config->radius_authprefer = 0;
        p = config->radius_authtypes_s;
        // parse radius_authtypes_s
        config->radius_authtypes = config->radius_authprefer = 0;
        p = config->radius_authtypes_s;

-       while (*p)
+       while (p && *p)

        {
                char *s = strpbrk(p, " \t,");
                int type = 0;
        {
                char *s = strpbrk(p, " \t,");
                int type = 0;


@@ -3969,11 +4184,13 @@ static void update_config()
                else if (!strncasecmp("pap", p, strlen(p)))
                        type = AUTHPAP;
                else
                else if (!strncasecmp("pap", p, strlen(p)))
                        type = AUTHPAP;
                else

-                       LOG(0, 0, 0, "Invalid RADIUS authentication type \"%s\"", p);
+                       LOG(0, 0, 0, "Invalid RADIUS authentication type \"%s\"\n", p);

 
                config->radius_authtypes |= type;
                if (!config->radius_authprefer)
                        config->radius_authprefer = type;
 
                config->radius_authtypes |= type;
                if (!config->radius_authprefer)
                        config->radius_authprefer = type;

+
+               p = s;

        }
 
        if (!config->radius_authtypes)
        }
 
        if (!config->radius_authtypes)


@@ -3996,6 +4213,9 @@ static void update_config()
                        strcat(config->radius_authtypes_s, ", pap");
        }
 
                        strcat(config->radius_authtypes_s, ", pap");
        }
 

+       if (!config->radius_dae_port)
+               config->radius_dae_port = DAEPORT;
+

        // re-initialise the random number source
        initrandom(config->random_device);
 
        // re-initialise the random number source
        initrandom(config->random_device);
 


@@ -4018,7 +4238,6 @@ static void update_config()
        }
 
        memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
        }
 
        memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));

-       if (!config->cleanup_interval) config->cleanup_interval = 10;

        if (!config->multi_read_count) config->multi_read_count = 10;
        if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
        if (!*config->cluster_interface)
        if (!config->multi_read_count) config->multi_read_count = 10;
        if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
        if (!*config->cluster_interface)


@@ -4105,7 +4324,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
                if (!session[s].ip)
                {
                        LOG(0, s, t, "   No IP allocated.  The IP address pool is FULL!\n");
                if (!session[s].ip)
                {
                        LOG(0, s, t, "   No IP allocated.  The IP address pool is FULL!\n");

-                       sessionshutdown(s, "No IP addresses available");
+                       sessionshutdown(s, "No IP addresses available.", 2, 7); // try another

                        return 0;
                }
                LOG(3, s, t, "   No IP allocated.  Assigned %s from pool\n",
                        return 0;
                }
                LOG(3, s, t, "   No IP allocated.  Assigned %s from pool\n",


@@ -4125,8 +4344,16 @@ int sessionsetup(tunnelidt t, sessionidt s)
                for (i = 1; i <= config->cluster_highest_sessionid; i++)
                {
                        if (i == s) continue;
                for (i = 1; i <= config->cluster_highest_sessionid; i++)
                {
                        if (i == s) continue;

-                       if (ip == session[i].ip) sessionkill(i, "Duplicate IP address");
-                       if (!session[s].walled_garden && !session[i].walled_garden && strcasecmp(user, session[i].user) == 0)
+                       if (!session[s].opened) continue;
+                       if (ip == session[i].ip)
+                       {
+                               sessionkill(i, "Duplicate IP address");
+                               continue;
+                       }
+
+                       if (config->allow_duplicate_users) continue;
+                       if (session[s].walled_garden || session[i].walled_garden) continue;
+                       if (!strcasecmp(user, session[i].user))

                                sessionkill(i, "Duplicate session for users");
                }
        }
                                sessionkill(i, "Duplicate session for users");
                }
        }


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

-       // TEMP: old session struct used a uint32_t to define the throttle
-       // speed for both up/down, new uses a uint16_t 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.


@@ -4373,6 +4594,7 @@ static int add_plugin(char *plugin_name)
                radiusnew,
                radiussend,
                getconfig,
                radiusnew,
                radiussend,
                getconfig,

+               sessionshutdown,

                sessionkill,
                throttle_session,
                cluster_send_session,
                sessionkill,
                throttle_session,
                cluster_send_session,


@@ -4693,6 +4915,9 @@ static tunnelidt new_tunnel()
 void become_master(void)
 {
        int s, i;
 void become_master(void)
 {
        int s, i;

+       static struct event_data d[RADIUS_FDS];
+       struct epoll_event e;
+

        run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
        // running a bunch of iptables commands is slow and can cause
        run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
        // running a bunch of iptables commands is slow and can cause


@@ -4711,11 +4936,14 @@ void become_master(void)
        }
 
        // add radius fds
        }
 
        // add radius fds

-       for (i = 0; i < config->num_radfds; i++)
+       e.events = EPOLLIN;
+       for (i = 0; i < RADIUS_FDS; i++)

        {
        {

-               FD_SET(radfds[i], &readset);
-               if (radfds[i] > readset_n)
-                       readset_n = radfds[i];
+               d[i].type = FD_TYPE_RADIUS;
+               d[i].index = i;
+               e.data.ptr = &d[i];
+
+               epoll_ctl(epollfd, EPOLL_CTL_ADD, radfds[i], &e);

        }
 }
 
        }
 }
 


@@ -4809,11 +5037,11 @@ static void unhide_value(uint8_t *value, size_t len, uint16_t type, uint8_t *vec
        uint8_t digest[16];
        uint8_t *last;
        size_t d = 0;
        uint8_t digest[16];
        uint8_t *last;
        size_t d = 0;

+       uint16_t m = htons(type);

 
        // Compute initial pad
        MD5Init(&ctx);
 
        // Compute initial pad
        MD5Init(&ctx);

-       MD5Update(&ctx, (uint8_t) (type >> 8) & 0xff, 1);
-       MD5Update(&ctx, (uint8_t)  type       & 0xff, 1);
+       MD5Update(&ctx, (unsigned char *) &m, 2);

        MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
        MD5Update(&ctx, vector, vec_len);
        MD5Final(digest, &ctx);
        MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
        MD5Update(&ctx, vector, vec_len);
        MD5Final(digest, &ctx);


@@ -4840,6 +5068,31 @@ static void unhide_value(uint8_t *value, size_t len, uint16_t type, uint8_t *vec
        }
 }
 
        }
 }
 

+int find_filter(char const *name, size_t len)
+{
+       int free = -1;
+       int i;
+
+       for (i = 0; i < MAXFILTER; i++)
+       {
+               if (!*ip_filters[i].name)
+               {
+                       if (free < 0)
+                               free = i;
+
+                       continue;
+               }
+
+               if (strlen(ip_filters[i].name) != len)
+                       continue;
+
+               if (!strncmp(ip_filters[i].name, name, len))
+                       return i;
+       }
+                       
+       return free;
+}
+

 static int ip_filter_port(ip_filter_portt *p, uint16_t port)
 {
        switch (p->op)
 static int ip_filter_port(ip_filter_portt *p, uint16_t port)
 {
        switch (p->op)