X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2f1b71cd7452cddfb456fd1a8df472893716a6d3..817af0291569f769947e8c14650bdf2f588addfb:/l2tpns.c?ds=inline

diff --git a/l2tpns.c b/l2tpns.c
index 3918529..127d515 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -1,10 +1,10 @@
 // L2TP Network Server
 // Adrian Kennard 2002
-// Copyright (c) 2003, 2004 Optus Internet Engineering
+// Copyright (c) 2003, 2004, 2005 Optus Internet Engineering
 // 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.34 2004/10/29 04:01:11 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.78 2005/01/13 07:57:36 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -23,6 +23,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.34 2004/10/29 04:01:11 bodea Exp
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -48,64 +49,66 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.34 2004/10/29 04:01:11 bodea Exp
 #include "util.h"
 #include "tbf.h"
 
+#ifdef BGP
+#include "bgp.h"
+#endif /* BGP */
+
 // Globals
-struct configt *config = NULL;	// all configuration
+configt *config = NULL;		// all configuration
 int tunfd = -1;			// tun interface file handle. (network device)
 int udpfd = -1;			// UDP file handle
 int controlfd = -1;		// Control signal handle
+int clifd = -1;			// Socket listening for CLI connections.
 int snoopfd = -1;		// UDP file handle for sending out intercept data
 int *radfds = NULL;		// RADIUS requests file handles
 int ifrfd = -1;			// File descriptor for routing, etc
+static int rand_fd = -1;	// Random data source
 time_t basetime = 0;		// base clock
 char hostname[1000] = "";	// us.
-int tunidx;			// ifr_ifindex of tun device
-u32 sessionid = 0;		// session id for radius accounting
-int syslog_log = 0;		// are we logging to syslog
-FILE *log_stream = NULL;	// file handle for direct logging (i.e. direct into file, not via syslog).
+static uint32_t sessionid = 0;	// session id for radius accounting
+static int syslog_log = 0;	// are we logging to syslog
+static FILE *log_stream = NULL;	// file handle for direct logging (i.e. direct into file, not via syslog).
 extern int cluster_sockfd;	// Intra-cluster communications socket.
-u32 last_id = 0;		// Last used PPP SID. Can I kill this?? -- mo
-int clifd = 0;			// Socket listening for CLI connections.
+uint32_t last_id = 0;		// Last used PPP SID. Can I kill this?? -- mo
 
 struct cli_session_actions *cli_session_actions = NULL;	// Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;	// Pending tunnel changes required by CLI
 
 static void *ip_hash[256];	// Mapping from IP address to session structures.
 
-u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;	// Global traffic counters.
-u32 eth_tx = 0, eth_rx = 0, eth_rx_pkt = 0;
-u32 ip_pool_size = 1;		// Size of the pool of addresses used for dynamic address allocation.
-time_t time_now = 0;		// Current time in seconds since epoch.
-char time_now_string[64] = {0};	// Current time as a string.
-char main_quit = 0;		// True if we're in the process of exiting.
-char *_program_name = NULL;
+// Traffic counters.
+static uint32_t udp_rx = 0, udp_rx_pkt = 0, udp_tx = 0;
+static uint32_t eth_rx = 0, eth_rx_pkt = 0;
+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 char main_quit = 0;		// True if we're in the process of exiting.
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 
-#ifdef BGP
-#include "bgp.h"
-struct bgp_peer *bgp_peers = 0;
-struct bgp_route_list *bgp_routes = 0;
-int bgp_configured = 0;
-#endif /* BGP */
-
 #define membersize(STRUCT, MEMBER) sizeof(((STRUCT *)0)->MEMBER)
-#define CONFIG(NAME, MEMBER, TYPE) { NAME, offsetof(struct configt, MEMBER), membersize(struct configt, MEMBER), TYPE }
+#define CONFIG(NAME, MEMBER, TYPE) { NAME, offsetof(configt, MEMBER), membersize(configt, MEMBER), TYPE }
 
-struct config_descriptt config_values[] = {
+config_descriptt config_values[] = {
 	CONFIG("debug", debug, INT),
 	CONFIG("log_file", log_filename, STRING),
 	CONFIG("pid_file", pid_file, STRING),
+	CONFIG("random_device", random_device, STRING),
 	CONFIG("l2tp_secret", l2tpsecret, STRING),
-	CONFIG("primary_dns", default_dns1, IP),
-	CONFIG("secondary_dns", default_dns2, IP),
+	CONFIG("primary_dns", default_dns1, IPv4),
+	CONFIG("secondary_dns", default_dns2, IPv4),
 	CONFIG("save_state", save_state, BOOL),
-	CONFIG("primary_radius", radiusserver[0], IP),
-	CONFIG("secondary_radius", radiusserver[1], IP),
+	CONFIG("primary_radius", radiusserver[0], IPv4),
+	CONFIG("secondary_radius", radiusserver[1], IPv4),
 	CONFIG("primary_radius_port", radiusport[0], SHORT),
 	CONFIG("secondary_radius_port", radiusport[1], SHORT),
 	CONFIG("radius_accounting", radius_accounting, BOOL),
 	CONFIG("radius_secret", radiussecret, STRING),
-	CONFIG("bind_address", bind_address, IP),
+	CONFIG("radius_authtypes", radius_authtypes_s, STRING),
+	CONFIG("bind_address", bind_address, IPv4),
+	CONFIG("peer_address", peer_address, IPv4),
 	CONFIG("send_garp", send_garp, BOOL),
 	CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
 	CONFIG("throttle_buckets", num_tbfs, INT),
@@ -117,21 +120,15 @@ struct config_descriptt config_values[] = {
 	CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
 	CONFIG("lock_pages", lock_pages, BOOL),
 	CONFIG("icmp_rate", icmp_rate, INT),
-	CONFIG("cluster_address", cluster_address, IP),
+	CONFIG("packet_limit", max_packets, INT),
+	CONFIG("cluster_address", cluster_address, IPv4),
 	CONFIG("cluster_interface", cluster_interface, STRING),
 	CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
 	CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
-#ifdef BGP
-	CONFIG("as_number", as_number, SHORT),
-	CONFIG("bgp_peer1", bgp_peer[0], STRING),
-	CONFIG("bgp_peer1_as", bgp_peer_as[0], SHORT),
-	CONFIG("bgp_peer2", bgp_peer[1], STRING),
-	CONFIG("bgp_peer2_as", bgp_peer_as[1], SHORT),
-#endif /* BGP */
 	{ NULL, 0, 0, 0 },
 };
 
-char *plugin_functions[] = {
+static char *plugin_functions[] = {
 	NULL,
 	"plugin_pre_auth",
 	"plugin_post_auth",
@@ -148,35 +145,46 @@ char *plugin_functions[] = {
 
 #define max_plugin_functions (sizeof(plugin_functions) / sizeof(char *))
 
+// Counters for shutdown sessions
+static sessiont shut_acct[8192];
+static sessionidt shut_acct_n = 0;
+
 tunnelt *tunnel = NULL;			// Array of tunnel structures.
 sessiont *session = NULL;		// Array of session structures.
-sessioncountt *sess_count = NULL;	// Array of partial per-session traffic counters.
+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.
-controlt *controlfree = 0;
+ip_filtert *ip_filters = NULL;	// Array of named filters.
+static controlt *controlfree = 0;
 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
-void sigalrm_handler(int);
-void sighup_handler(int);
-void sigterm_handler(int);
-void sigquit_handler(int);
-void sigchild_handler(int);
-void read_config_file();
-void read_state();
-void dump_state();
-void tunnel_clean();
-tunnelidt new_tunnel();
-void update_config();
-int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length);
-
-static void cache_ipmap(ipt ip, int s);
-static void uncache_ipmap(ipt ip);
+static void cache_ipmap(in_addr_t ip, int s);
+static void uncache_ipmap(in_addr_t ip);
+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 sigterm_handler(int sig);
+static void sigquit_handler(int sig);
+static void sigchild_handler(int sig);
+static void read_state(void);
+static void dump_state(void);
+static void build_chap_response(char *challenge, uint8_t id, uint16_t challenge_length, char **challenge_response);
+static void update_config(void);
+static void read_config_file(void);
+static void initplugins(void);
+static int add_plugin(char *plugin_name);
+static int remove_plugin(char *plugin_name);
+static void plugins_done(void);
+static void processcontrol(uint8_t *buf, int len, struct sockaddr_in *addr, int alen);
+static tunnelidt new_tunnel(void);
+static int unhide_avp(uint8_t *avp, tunnelidt t, sessionidt s, uint16_t length);
 
 // return internal time (10ths since process startup)
-clockt now(void)
+static clockt now(void)
 {
 	struct timeval t;
 	gettimeofday(&t, 0);
@@ -186,7 +194,7 @@ clockt now(void)
 // work out a retry time based on try number
 // This is a straight bounded exponential backoff.
 // Maximum re-try time is 32 seconds. (2^5).
-clockt backoff(u8 try)
+clockt backoff(uint8_t try)
 {
 	if (try > 5) try = 5;                  // max backoff
 	return now() + 10 * (1 << try);
@@ -194,12 +202,11 @@ clockt backoff(u8 try)
 
 
 //
-// Log a debug message.
+// Log a debug message.  Typically called via the LOG macro
 //
-void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
+void _log(int level, sessionidt s, tunnelidt t, const char *format, ...)
 {
 	static char message[65536] = {0};
-	static char message2[65536] = {0};
 	va_list ap;
 
 #ifdef RINGBUFFER
@@ -212,7 +219,6 @@ void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format,
 				ringbuffer->head = 0;
 
 		ringbuffer->buffer[ringbuffer->tail].level = level;
-		ringbuffer->buffer[ringbuffer->tail].address = address;
 		ringbuffer->buffer[ringbuffer->tail].session = s;
 		ringbuffer->buffer[ringbuffer->tail].tunnel = t;
 		va_start(ap, format);
@@ -224,32 +230,27 @@ void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format,
 	if (config->debug < level) return;
 
 	va_start(ap, format);
+	vsnprintf(message, sizeof(message), format, ap);
+
 	if (log_stream)
-	{
-		vsnprintf(message2, 65535, format, ap);
-		snprintf(message, 65535, "%s %02d/%02d %s", time_now_string, t, s, message2);
-		fprintf(log_stream, "%s", message);
-	}
+		fprintf(log_stream, "%s %02d/%02d %s", time_now_string, t, s, message);
 	else if (syslog_log)
-	{
-		vsnprintf(message2, 65535, format, ap);
-		snprintf(message, 65535, "%02d/%02d %s", t, s, message2);
-		syslog(level + 2, message); // We don't need LOG_EMERG or LOG_ALERT
-	}
+		syslog(level + 2, "%02d/%02d %s", t, s, message); // We don't need LOG_EMERG or LOG_ALERT
+
 	va_end(ap);
 }
 
-void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *title, const char *data, int maxsize)
+void _log_hex(int level, const char *title, const char *data, int maxsize)
 {
 	int i, j;
-	const u8 *d = (const u8 *)data;
+	const uint8_t *d = (const uint8_t *) data;
 
 	if (config->debug < level) return;
 
-	// No support for log_hex to syslog
+	// No support for _log_hex to syslog
 	if (log_stream)
 	{
-		log(level, address, s, t, "%s (%d bytes):\n", title, maxsize);
+		_log(level, 0, 0, "%s (%d bytes):\n", title, maxsize);
 		setvbuf(log_stream, NULL, _IOFBF, 16384);
 
 		for (i = 0; i < maxsize; )
@@ -290,16 +291,82 @@ void _log_hex(int level, ipt address, sessionidt s, tunnelidt t, const char *tit
 	}
 }
 
+// initialise the random generator
+static void initrandom(char *source)
+{
+	static char path[sizeof(config->random_device)] = "*undefined*";
+
+	// reinitialise only if we are forced to do so or if the config has changed
+	if (source && !strncmp(path, source, sizeof(path)))
+		return;
+
+	// close previous source, if any
+	if (rand_fd >= 0) close(rand_fd);
+
+	rand_fd = -1;
+
+	if (source)
+	{
+		// register changes
+		snprintf(path, sizeof(path), "%s", source);
+
+		if (*path == '/')
+		{
+			rand_fd = open(path, O_RDONLY|O_NONBLOCK);
+			if (rand_fd < 0)
+				LOG(0, 0, 0, "Error opening the random device %s: %s\n",
+					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
+void random_data(uint8_t *buf, int len)
+{
+	int n = 0;
+
+	CSTAT(random_data);
+	if (rand_fd >= 0)
+	{
+		n = read(rand_fd, buf, len);
+		if (n >= len) return;
+		if (n < 0)
+		{
+			if (errno != EAGAIN)
+			{
+				LOG(0, 0, 0, "Error reading from random source: %s\n",
+					strerror(errno));
+
+				// fall back to rand()
+				initrandom(0);
+			}
+
+			n = 0;
+		}
+	}
+
+	// append missing data
+	while (n < len)
+		// not using the low order bits from the prng stream
+		buf[n++] = (rand() >> 4) & 0xff;
+}
 
 // Add a route
 //
 // This adds it to the routing table, advertises it
-// via iBGP if enabled, and stuffs it into the
+// via BGP if enabled, and stuffs it into the
 // 'sessionbyip' cache.
 //
 // 'ip' and 'mask' must be in _host_ order.
 //
-void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
+static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, int add)
 {
 	struct rtentry r;
 	int i;
@@ -311,25 +378,23 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 	memset(&r, 0, sizeof(r));
 	r.rt_dev = config->tundevice;
 	r.rt_dst.sa_family = AF_INET;
-	*(u32 *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
+	*(uint32_t *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
 	r.rt_gateway.sa_family = AF_INET;
-	*(u32 *) & (((struct sockaddr_in *) &r.rt_gateway)->sin_addr.s_addr) = htonl(gw);
+	*(uint32_t *) & (((struct sockaddr_in *) &r.rt_gateway)->sin_addr.s_addr) = htonl(gw);
 	r.rt_genmask.sa_family = AF_INET;
-	*(u32 *) & (((struct sockaddr_in *) &r.rt_genmask)->sin_addr.s_addr) = htonl(mask);
+	*(uint32_t *) & (((struct sockaddr_in *) &r.rt_genmask)->sin_addr.s_addr) = htonl(mask);
 	r.rt_flags = (RTF_UP | RTF_STATIC);
 	if (gw)
 		r.rt_flags |= RTF_GATEWAY;
 	else if (mask == 0xffffffff)
 		r.rt_flags |= RTF_HOST;
 
-	log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
-	    add ? "add" : "del",
-	    ip   >> 24, ip   >> 16 & 0xff, ip   >> 8 & 0xff, ip   & 0xff,
-	    mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
-	    gw   >> 24, gw   >> 16 & 0xff, gw   >> 8 & 0xff, gw   & 0xff);
+	LOG(1, s, 0, "Route %s %s/%s%s%s\n", add ? "add" : "del",
+	    fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1),
+	    gw ? " via" : "", gw ? fmtaddr(htonl(gw), 2) : "");
 
 	if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
-		log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+		LOG(0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
 
 #ifdef BGP
 	if (add)
@@ -339,7 +404,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 #endif /* BGP */
 
 		// Add/Remove the IPs to the 'sessionbyip' cache.
-		// Note that we add the zero address in the case of 
+		// Note that we add the zero address in the case of
 		// a network route. Roll on CIDR.
 
 		// Note that 's == 0' implies this is the address pool.
@@ -358,7 +423,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 
 //
 // Set up TUN interface
-void inittun(void)
+static void inittun(void)
 {
 	struct ifreq ifr;
 	struct sockaddr_in sin = {0};
@@ -368,7 +433,7 @@ void inittun(void)
 	tunfd = open(TUNDEVICE, O_RDWR);
 	if (tunfd < 0)
 	{                          // fatal
-		log(0, 0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
+		LOG(0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
 		exit(1);
 	}
 	{
@@ -377,7 +442,7 @@ void inittun(void)
 	}
 	if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
 		exit(1);
 	}
 	assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
@@ -390,32 +455,26 @@ void inittun(void)
 
 	if (ioctl(ifrfd, SIOCSIFADDR, (void *) &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error setting tun address: %s\n", strerror(errno));
 		exit(1);
 	}
 	/* Bump up the qlen to deal with bursts from the network */
 	ifr.ifr_qlen = 1000;
 	if (ioctl(ifrfd, SIOCSIFTXQLEN, (void *) &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
 		exit(1);
 	}
 	ifr.ifr_flags = IFF_UP;
 	if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
-		exit(1);
-	}
-	if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
-	{
-		log(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
 		exit(1);
 	}
-	tunidx = ifr.ifr_ifindex;
 }
 
 // set up UDP port
-void initudp(void)
+static void initudp(void)
 {
 	int on = 1;
 	struct sockaddr_in addr;
@@ -433,7 +492,7 @@ void initudp(void)
 	}
 	if (bind(udpfd, (void *) &addr, sizeof(addr)) < 0)
 	{
-		log(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
 		exit(1);
 	}
 	snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -441,12 +500,12 @@ void initudp(void)
 	// Control
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_port = htons(1702);
-	controlfd = socket(AF_INET, SOCK_DGRAM, 17);
+	addr.sin_port = htons(NSCTL_PORT);
+	controlfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	setsockopt(controlfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 	if (bind(controlfd, (void *) &addr, sizeof(addr)) < 0)
 	{
-		log(0, 0, 0, 0, "Error in control bind: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error in control bind: %s\n", strerror(errno));
 		exit(1);
 	}
 }
@@ -466,27 +525,26 @@ void initudp(void)
 // IP address.
 //
 
-int lookup_ipmap(ipt ip)
+static int lookup_ipmap(in_addr_t ip)
 {
-	u8 *a = (u8 *)&ip;
-	char **d = (char **) ip_hash;
-	int s;
+	uint8_t *a = (uint8_t *) &ip;
+	uint8_t **d = (uint8_t **) ip_hash;
 
-	if (!(d = (char **) d[(size_t) *a++])) return 0;
-	if (!(d = (char **) d[(size_t) *a++])) return 0;
-	if (!(d = (char **) d[(size_t) *a++])) return 0;
+	if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
+	if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
+	if (!(d = (uint8_t **) d[(size_t) *a++])) return 0;
 
-	s = (ipt) d[(size_t) *a];
-	return s;
+	return (int) (intptr_t) d[(size_t) *a];
 }
 
-sessionidt sessionbyip(ipt ip)
+sessionidt sessionbyip(in_addr_t ip)
 {
 	int s = lookup_ipmap(ip);
-	CSTAT(call_sessionbyip);
+	CSTAT(sessionbyip);
 
 	if (s > 0 && s < MAXSESSION && session[s].tunnel)
-		return s;
+		return (sessionidt) s;
+
 	return 0;
 }
 
@@ -496,34 +554,35 @@ sessionidt sessionbyip(ipt ip)
 //
 // (It's actually cached in network order)
 //
-static void cache_ipmap(ipt ip, int s)
+static void cache_ipmap(in_addr_t ip, int s)
 {
-	ipt nip = htonl(ip);		// MUST be in network order. I.e. MSB must in be ((char*)(&ip))[0]
-	u8 *a = (u8 *) &nip;
-	char **d = (char **) ip_hash;
+	in_addr_t nip = htonl(ip);	// MUST be in network order. I.e. MSB must in be ((char *) (&ip))[0]
+	uint8_t *a = (uint8_t *) &nip;
+	uint8_t **d = (uint8_t **) ip_hash;
 	int i;
 
 	for (i = 0; i < 3; i++)
 	{
 		if (!d[(size_t) a[i]])
 		{
-			if (!(d[(size_t) a[i]] = calloc(256, sizeof (void *))))
+			if (!(d[(size_t) a[i]] = calloc(256, sizeof(void *))))
 				return;
 		}
 
-		d = (char **) d[(size_t) a[i]];
+		d = (uint8_t **) d[(size_t) a[i]];
 	}
 
-	d[(size_t) a[3]] = (char *)((int)s);
+	d[(size_t) a[3]] = (uint8_t *) (intptr_t) s;
 
 	if (s > 0)
-		log(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
+		LOG(4, s, session[s].tunnel, "Caching ip address %s\n", fmtaddr(nip, 0));
+
 	else if (s == 0)
-		log(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
+		LOG(4, 0, 0, "Un-caching ip address %s\n", fmtaddr(nip, 0));
 	// else a map to an ip pool index.
 }
 
-static void uncache_ipmap(ipt ip)
+static void uncache_ipmap(in_addr_t ip)
 {
 	cache_ipmap(ip, 0);	// Assign it to the NULL session.
 }
@@ -546,22 +605,22 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 	{
 		if (!d[i])
 			continue;
-		e = (char**) d[i];
+		e = (char **) d[i];
 		for (j = 0; j < 256; ++j)
 		{
 			if (!e[j])
 				continue;
-			f = (char**) e[j];
+			f = (char **) e[j];
 			for (k = 0; k < 256; ++k)
 			{
 				if (!f[k])
 					continue;
-				g = (char**)f[k];
+				g = (char **)f[k];
 				for (l = 0; l < 256; ++l)
 				{
 					if (!g[l])
 						continue;
-					cli_print(cli, "%7d %d.%d.%d.%d", (int) g[l], i, j, k, l);
+					cli_print(cli, "%7d %d.%d.%d.%d", (int) (intptr_t) g[l], i, j, k, l);
 					++count;
 				}
 			}
@@ -581,7 +640,7 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 sessionidt sessionbyuser(char *username)
 {
 	int s;
-	CSTAT(call_sessionbyuser);
+	CSTAT(sessionbyuser);
 
 	for (s = 1; s < MAXSESSION ; ++s)
 	{
@@ -595,30 +654,30 @@ sessionidt sessionbyuser(char *username)
 	return 0;	// Not found.
 }
 
-void send_garp(ipt ip)
+void send_garp(in_addr_t ip)
 {
 	int s;
 	struct ifreq ifr;
-	u8 mac[6];
+	uint8_t mac[6];
 
 	s = socket(PF_INET, SOCK_DGRAM, 0);
 	if (s < 0)
 	{
-		log(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
 		return;
 	}
 	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
 	if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
 		close(s);
 		return;
 	}
 	memcpy(mac, &ifr.ifr_hwaddr.sa_data, 6*sizeof(char));
 	if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
 		close(s);
 		return;
 	}
@@ -627,13 +686,13 @@ void send_garp(ipt ip)
 }
 
 // Find session by username, 0 for not found
-sessiont *sessiontbysessionidt(sessionidt s)
+static sessiont *sessiontbysessionidt(sessionidt s)
 {
 	if (!s || s > MAXSESSION) return NULL;
 	return &session[s];
 }
 
-sessionidt sessionidtbysessiont(sessiont *s)
+static sessionidt sessionidtbysessiont(sessiont *s)
 {
 	sessionidt val = s-session;
 	if (s < session || val > MAXSESSION) return 0;
@@ -641,16 +700,16 @@ sessionidt sessionidtbysessiont(sessiont *s)
 }
 
 // actually send a control message for a specific tunnel
-void tunnelsend(u8 * buf, u16 l, tunnelidt t)
+void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
 {
 	struct sockaddr_in addr;
 
-	CSTAT(call_tunnelsend);
+	CSTAT(tunnelsend);
 
 	if (!t)
 	{
 		static int backtrace_count = 0;
-		log(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
+		LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n");
 		STAT(tunnel_tx_errors);
 		log_backtrace(backtrace_count, 5)
 		return;
@@ -659,18 +718,19 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 	if (!tunnel[t].ip)
 	{
 		static int backtrace_count = 0;
-		log(1, 0, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
+		LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
 		log_backtrace(backtrace_count, 5)
 		STAT(tunnel_tx_errors);
 		return;
 	}
+
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	*(u32 *) & addr.sin_addr = htonl(tunnel[t].ip);
+	*(uint32_t *) & addr.sin_addr = htonl(tunnel[t].ip);
 	addr.sin_port = htons(tunnel[t].port);
 
 	// sequence expected, if sequence in message
-	if (*buf & 0x08) *(u16 *) (buf + ((*buf & 0x40) ? 10 : 8)) = htons(tunnel[t].nr);
+	if (*buf & 0x08) *(uint16_t *) (buf + ((*buf & 0x40) ? 10 : 8)) = htons(tunnel[t].nr);
 
 	// If this is a control message, deal with retries
 	if (*buf & 0x80)
@@ -680,19 +740,19 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 		if (tunnel[t].try > 1)
 		{
 			STAT(tunnel_retries);
-			log(3, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);
+			LOG(3, 0, t, "Control message resend try %d\n", tunnel[t].try);
 		}
 	}
 
 	if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
 	{
-		log(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
+		LOG(0, ntohs((*(uint16_t *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
 				strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
 		STAT(tunnel_tx_errors);
 		return;
 	}
 
-	log_hex(5, "Send Tunnel Data", buf, l);
+	LOG_HEX(5, "Send Tunnel Data", buf, l);
 	STAT(tunnel_tx_packets);
 	INC_STAT(tunnel_tx_bytes, l);
 }
@@ -701,37 +761,37 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 // Tiny helper function to write data to
 // the 'tun' device.
 //
-int tun_write(u8 * data, int size)
+int tun_write(uint8_t * data, int size)
 {
 	return write(tunfd, data, size);
 }
 
 // process outgoing (to tunnel) IP
 //
-void processipout(u8 * buf, int len)
+static void processipout(uint8_t * buf, int len)
 {
 	sessionidt s;
 	sessiont *sp;
 	tunnelidt t;
-	ipt ip;
+	in_addr_t ip;
 
-	char * data = buf;	// Keep a copy of the originals.
+	char *data = buf;	// Keep a copy of the originals.
 	int size = len;
 
-	u8 b[MAXETHER + 20];
+	uint8_t b[MAXETHER + 20];
 
-	CSTAT(call_processipout);
+	CSTAT(processipout);
 
 	if (len < MIN_IP_SIZE)
 	{
-		log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
-		STAT(tunnel_tx_errors);
+		LOG(1, 0, 0, "Short IP, %d bytes\n", len);
+		STAT(tun_rx_errors);
 		return;
 	}
 	if (len >= MAXETHER)
 	{
-		log(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
-		STAT(tunnel_tx_errors);
+		LOG(1, 0, 0, "Oversize IP packet %d bytes\n", len);
+		STAT(tun_rx_errors);
 		return;
 	}
 
@@ -740,13 +800,13 @@ void processipout(u8 * buf, int len)
 	len -= 4;
 
 	// Got an IP header now
-	if (*(u8 *)(buf) >> 4 != 4)
+	if (*(uint8_t *)(buf) >> 4 != 4)
 	{
-		log(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
+		LOG(1, 0, 0, "IP: Don't understand anything except IPv4\n");
 		return;
 	}
 
-	ip = *(u32 *)(buf + 16);
+	ip = *(uint32_t *)(buf + 16);
 	if (!(s = sessionbyip(ip)))
 	{
 		// Is this a packet for a session that doesn't exist?
@@ -761,14 +821,57 @@ void processipout(u8 * buf, int len)
 
 		if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
 		{
-			log(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));
-			host_unreachable(*(u32 *)(buf + 12), *(u16 *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
+			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);
 		}
 		return;
 	}
 	t = session[s].tunnel;
 	sp = &session[s];
 
+	// DoS prevention: enforce a maximum number of packets per 0.1s for a session
+	if (config->max_packets > 0)
+	{
+		if (sess_local[s].last_packet_out == TIME)
+		{
+			int max = config->max_packets;
+
+			// All packets for throttled sessions are handled by the
+			// master, so further limit by using the throttle rate.
+			// A bit of a kludge, since throttle rate is in kbps,
+			// but should still be generous given our average DSL
+			// packet size is 200 bytes: a limit of 28kbps equates
+			// to around 180 packets per second.
+			if (!config->cluster_iam_master && sp->throttle_out && sp->throttle_out < max)
+				max = sp->throttle_out;
+
+			if (++sess_local[s].packets_out > max)
+			{
+				sess_local[s].packets_dropped++;
+				return;
+			}
+		}
+		else
+		{
+			if (sess_local[s].packets_dropped)
+			{
+				INC_STAT(tun_rx_dropped, sess_local[s].packets_dropped);
+				LOG(3, s, t, "Dropped %u/%u packets to %s for %suser %s\n",
+					sess_local[s].packets_out, sess_local[s].packets_dropped,
+					fmtaddr(ip, 0), sp->throttle_out ? "throttled " : "",
+					sp->user);
+			}
+
+			sess_local[s].last_packet_out = TIME;
+			sess_local[s].packets_out = 1;
+			sess_local[s].packets_dropped = 0;
+		}
+	}
+
+	// run access-list if any
+	if (session[s].filter_out && !ip_filter(buf, len, session[s].filter_out - 1))
+		return;
+
 	if (sp->tbf_out)
 	{
 		// Are we throttling this session?
@@ -785,45 +888,41 @@ void processipout(u8 * buf, int len)
 		return;
 	}
 
-	// Snooping this session, send it to intercept box
-	if (sp->snoop_ip && sp->snoop_port)
-		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
-
-	log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
+	LOG(5, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
 	// Add on L2TP header
 	{
-		u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
-		if (!p)
-		{
-			log(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
-			return;
-		}
+		uint8_t *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
+		if (!p) return;
 		tunnelsend(b, len + (p-b), t); // send it...
 	}
 
+	// Snooping this session, send it to intercept box
+	if (sp->snoop_ip && sp->snoop_port)
+		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+
 	sp->cout += len; // byte count
 	sp->total_cout += len; // byte count
 	sp->pout++;
 	udp_tx += len;
-	sess_count[s].cout += len;	// To send to master..
+	sess_local[s].cout += len;	// To send to master..
 }
 
 //
 // Helper routine for the TBF filters.
 // Used to send queued data in to the user!
 //
-void send_ipout(sessionidt s, u8 *buf, int len)
+static void send_ipout(sessionidt s, uint8_t *buf, int len)
 {
 	sessiont *sp;
 	tunnelidt t;
-	ipt ip;
+	in_addr_t ip;
 
-	u8 b[MAXETHER + 20];
+	uint8_t b[MAXETHER + 20];
 
 	if (len < 0 || len > MAXETHER)
 	{
-		log(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
+		LOG(1, 0, 0, "Odd size IP packet: %d bytes\n", len);
 		return;
 	}
 
@@ -831,82 +930,80 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 	buf += 4;
 	len -= 4;
 
-	ip = *(u32 *)(buf + 16);
+	ip = *(in_addr_t *)(buf + 16);
 
 	if (!session[s].ip)
 		return;
+
 	t = session[s].tunnel;
 	sp = &session[s];
 
-	log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
-
-	// Snooping this session.
-	if (sp->snoop_ip && sp->snoop_port)
-		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+	LOG(5, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
 	// Add on L2TP header
 	{
-		u8 *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
-		if (!p)
-		{
-			log(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
-			return;
-		}
+		uint8_t *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
+		if (!p) return;
 		tunnelsend(b, len + (p-b), t); // send it...
 	}
+
+	// Snooping this session.
+	if (sp->snoop_ip && sp->snoop_port)
+		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+
 	sp->cout += len; // byte count
 	sp->total_cout += len; // byte count
 	sp->pout++;
 	udp_tx += len;
-	sess_count[s].cout += len;	// To send to master..
+	sess_local[s].cout += len;	// To send to master..
 }
 
 // add an AVP (16 bit)
-void control16(controlt * c, u16 avp, u16 val, u8 m)
+static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
 {
-	u16 l = (m ? 0x8008 : 0x0008);
-	*(u16 *) (c->buf + c->length + 0) = htons(l);
-	*(u16 *) (c->buf + c->length + 2) = htons(0);
-	*(u16 *) (c->buf + c->length + 4) = htons(avp);
-	*(u16 *) (c->buf + c->length + 6) = htons(val);
+	uint16_t l = (m ? 0x8008 : 0x0008);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	*(uint16_t *) (c->buf + c->length + 6) = htons(val);
 	c->length += 8;
 }
 
 // add an AVP (32 bit)
-void control32(controlt * c, u16 avp, u32 val, u8 m)
+static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
 {
-	u16 l = (m ? 0x800A : 0x000A);
-	*(u16 *) (c->buf + c->length + 0) = htons(l);
-	*(u16 *) (c->buf + c->length + 2) = htons(0);
-	*(u16 *) (c->buf + c->length + 4) = htons(avp);
-	*(u32 *) (c->buf + c->length + 6) = htonl(val);
+	uint16_t l = (m ? 0x800A : 0x000A);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
+	*(uint32_t *) (c->buf + c->length + 6) = htonl(val);
 	c->length += 10;
 }
 
 // add an AVP (32 bit)
-void controls(controlt * c, u16 avp, char *val, u8 m)
+static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
 {
-	u16 l = ((m ? 0x8000 : 0) + strlen(val) + 6);
-	*(u16 *) (c->buf + c->length + 0) = htons(l);
-	*(u16 *) (c->buf + c->length + 2) = htons(0);
-	*(u16 *) (c->buf + c->length + 4) = htons(avp);
+	uint16_t l = ((m ? 0x8000 : 0) + strlen(val) + 6);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
 	memcpy(c->buf + c->length + 6, val, strlen(val));
 	c->length += 6 + strlen(val);
 }
 
 // add a binary AVP
-void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
+static void controlb(controlt * c, uint16_t avp, char *val, unsigned int len, uint8_t m)
 {
-	u16 l = ((m ? 0x8000 : 0) + len + 6);
-	*(u16 *) (c->buf + c->length + 0) = htons(l);
-	*(u16 *) (c->buf + c->length + 2) = htons(0);
-	*(u16 *) (c->buf + c->length + 4) = htons(avp);
+	uint16_t l = ((m ? 0x8000 : 0) + len + 6);
+	*(uint16_t *) (c->buf + c->length + 0) = htons(l);
+	*(uint16_t *) (c->buf + c->length + 2) = htons(0);
+	*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
 	memcpy(c->buf + c->length + 6, val, len);
 	c->length += 6 + len;
 }
 
 // new control connection
-controlt *controlnew(u16 mtype)
+static controlt *controlnew(uint16_t mtype)
 {
 	controlt *c;
 	if (!controlfree)
@@ -918,7 +1015,7 @@ controlt *controlnew(u16 mtype)
 	}
 	assert(c);
 	c->next = 0;
-	*(u16 *) (c->buf + 0) = htons(0xC802); // flags/ver
+	*(uint16_t *) (c->buf + 0) = htons(0xC802); // flags/ver
 	c->length = 12;
 	control16(c, 0, mtype, 1);
 	return c;
@@ -926,36 +1023,38 @@ controlt *controlnew(u16 mtype)
 
 // send zero block if nothing is waiting
 // (ZLB send).
-void controlnull(tunnelidt t)
+static void controlnull(tunnelidt t)
 {
-	u8 buf[12];
+	uint8_t buf[12];
 	if (tunnel[t].controlc)	// Messages queued; They will carry the ack.
 		return;
 
-	*(u16 *) (buf + 0) = htons(0xC802); // flags/ver
-	*(u16 *) (buf + 2) = htons(12); // length
-	*(u16 *) (buf + 4) = htons(tunnel[t].far); // tunnel
-	*(u16 *) (buf + 6) = htons(0); // session
-	*(u16 *) (buf + 8) = htons(tunnel[t].ns); // sequence
-	*(u16 *) (buf + 10) = htons(tunnel[t].nr); // sequence
+	*(uint16_t *) (buf + 0) = htons(0xC802); // flags/ver
+	*(uint16_t *) (buf + 2) = htons(12); // length
+	*(uint16_t *) (buf + 4) = htons(tunnel[t].far); // tunnel
+	*(uint16_t *) (buf + 6) = htons(0); // session
+	*(uint16_t *) (buf + 8) = htons(tunnel[t].ns); // sequence
+	*(uint16_t *) (buf + 10) = htons(tunnel[t].nr); // sequence
 	tunnelsend(buf, 12, t);
 }
 
 // add a control message to a tunnel, and send if within window
-void controladd(controlt * c, tunnelidt t, sessionidt s)
+static void controladd(controlt * c, tunnelidt t, sessionidt s)
 {
-	*(u16 *) (c->buf + 2) = htons(c->length); // length
-	*(u16 *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
-	*(u16 *) (c->buf + 6) = htons(s ? session[s].far : 0); // session
-	*(u16 *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
+	*(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 + 8) = htons(tunnel[t].ns); // sequence
 	tunnel[t].ns++;              // advance sequence
 	// link in message in to queue
 	if (tunnel[t].controlc)
 		tunnel[t].controle->next = c;
 	else
 		tunnel[t].controls = c;
+
 	tunnel[t].controle = c;
 	tunnel[t].controlc++;
+
 	// send now if space in window
 	if (tunnel[t].controlc <= tunnel[t].window)
 	{
@@ -967,150 +1066,184 @@ void controladd(controlt * c, tunnelidt t, sessionidt s)
 //
 // Throttle or Unthrottle a session
 //
-// Throttle the data folling through a session
-// to be no more than 'throttle' kbit/sec each way.
+// Throttle the data from/to through a session to no more than
+// 'rate_in' kbit/sec in (from user) or 'rate_out' kbit/sec out (to
+// user).
 //
-int throttle_session(sessionidt s, int throttle)
+// If either value is -1, the current value is retained for that
+// direction.
+//
+void throttle_session(sessionidt s, int rate_in, int rate_out)
 {
 	if (!session[s].tunnel)
-		return 0;	// No-one home.
+		return; // No-one home.
 
 	if (!*session[s].user)
-	        return 0; // User not logged in
+	        return; // User not logged in
 
-	if (throttle)
+	if (rate_in >= 0)
 	{
-		int rate_in = throttle & 0x0000FFFF;
-		int rate_out = throttle >> 16;
+		int bytes = rate_in * 1024 / 8; // kbits to bytes
+		if (session[s].tbf_in)
+			free_tbf(session[s].tbf_in);
 
-		if (session[s].tbf_in || session[s].tbf_out)
-		{
-			if (throttle == session[s].throttle)
-				return 1;
+		if (rate_in > 0)
+			session[s].tbf_in = new_tbf(s, bytes * 2, bytes, send_ipin);
+		else
+			session[s].tbf_in = 0;
 
-			// Currently throttled but the rate is changing.
+		session[s].throttle_in = rate_in;
+	}
 
-			free_tbf(session[s].tbf_in);
+	if (rate_out >= 0)
+	{
+		int bytes = rate_out * 1024 / 8;
+		if (session[s].tbf_out)
 			free_tbf(session[s].tbf_out);
-		}
 
-		if (rate_in) session[s].tbf_in = new_tbf(s, rate_in * 1024 / 4, rate_in * 1024 / 8, send_ipin);
-		if (rate_out) session[s].tbf_out = new_tbf(s, rate_out * 1024 / 4, rate_out * 1024 / 8, send_ipout);
-
-		if (throttle != session[s].throttle)
-		{
-			// Changed. Flood to slaves.
-			session[s].throttle = throttle;
-			cluster_send_session(s);
-		}
+		if (rate_out > 0)
+			session[s].tbf_out = new_tbf(s, bytes * 2, bytes, send_ipout);
+		else
+			session[s].tbf_out = 0;
 
-		return 1;
+		session[s].throttle_out = rate_out;
 	}
+}
 
-	// else Unthrottling.
-
-	if (!session[s].tbf_in && !session[s].tbf_out && !session[s].throttle)
-		return 0;
+// add/remove filters from session (-1 = no change)
+void filter_session(sessionidt s, int filter_in, int filter_out)
+{
+	if (!session[s].tunnel)
+		return; // No-one home.
 
-	free_tbf(session[s].tbf_in);
-	session[s].tbf_in = 0;
+	if (!*session[s].user)
+	        return; // User not logged in
 
-	free_tbf(session[s].tbf_out);
-	session[s].tbf_out = 0;
+	// paranoia
+	if (filter_in > MAXFILTER) filter_in = -1;
+	if (filter_out > MAXFILTER) filter_out = -1;
+	if (session[s].filter_in > MAXFILTER) session[s].filter_in = 0;
+	if (session[s].filter_out > MAXFILTER) session[s].filter_out = 0;
 
-	if (throttle != session[s].throttle)
+	if (filter_in >= 0)
 	{
-		// Changed. Flood to slaves.
-		session[s].throttle = throttle;
-		cluster_send_session(s);
+		if (session[s].filter_in)
+			ip_filters[session[s].filter_in - 1].used--;
+
+		if (filter_in > 0)
+			ip_filters[filter_in - 1].used++;
+
+		session[s].filter_in = filter_in;
 	}
 
-	return 0;
+	if (filter_out >= 0)
+	{
+		if (session[s].filter_out)
+			ip_filters[session[s].filter_out - 1].used--;
+
+		if (filter_out > 0)
+			ip_filters[filter_out - 1].used++;
+
+		session[s].filter_out = filter_out;
+	}
 }
 
 // start tidy shutdown of session
 void sessionshutdown(sessionidt s, char *reason)
 {
-	int dead = session[s].die;
 	int walled_garden = session[s].walled_garden;
 
 
-	CSTAT(call_sessionshutdown);
+	CSTAT(sessionshutdown);
 
 	if (!session[s].tunnel)
 	{
-		log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
+		LOG(3, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
 		return;                   // not a live session
 	}
 
-	if (!dead)
-		log(2, 0, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
-
-	session[s].die = now() + 150; // Clean up in 15 seconds
-
+	if (!session[s].die)
 	{
 		struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
+		LOG(2, s, session[s].tunnel, "Shutting down session %d: %s\n", s, reason);
 		run_plugins(PLUGIN_KILL_SESSION, &data);
 	}
 
-	// RADIUS Stop message
-	if (session[s].opened && !walled_garden && !dead)
+	if (session[s].opened && !walled_garden && !session[s].die)
 	{
-		u16 r = session[s].radius;
+		// RADIUS Stop message
+		uint16_t r = session[s].radius;
 		if (!r)
 		{
 			if (!(r = radiusnew(s)))
 			{
-				log(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
+				LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
 				STAT(radius_overflow);
 			}
 			else
 			{
-				int n;
-				for (n = 0; n < 15; n++)
-					radius[r].auth[n] = rand();
+				random_data(radius[r].auth, sizeof(radius[r].auth));
 			}
 		}
+
 		if (r && radius[r].state != RADIUSSTOP)
 			radiussend(r, RADIUSSTOP); // stop, if not already trying
+
+	    	// Save counters to dump to accounting file
+		if (*config->accounting_dir && shut_acct_n < sizeof(shut_acct) / sizeof(*shut_acct))
+			memcpy(&shut_acct[shut_acct_n++], &session[s], sizeof(session[s]));
 	}
 
 	if (session[s].ip)
 	{                          // IP allocated, clear and unroute
 		int r;
+		int routed = 0;
 		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
 		{
-			routeset(s, session[s].route[r].ip, session[s].route[r].mask, session[s].ip, 0);
+			if ((session[s].ip & session[s].route[r].mask) ==
+			    (session[s].route[r].ip & session[s].route[r].mask))
+				routed++;
+
+			routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);
 			session[s].route[r].ip = 0;
 		}
 
 		if (session[s].ip_pool_index == -1) // static ip
 		{
-			routeset(s, session[s].ip, 0, 0, 0);	// Delete route.
+			if (!routed) routeset(s, session[s].ip, 0, 0, 0);
 			session[s].ip = 0;
 		}
 		else
 			free_ip_address(s);
-
-		if (session[s].throttle)	// Unthrottle if throttled.
-			throttle_session(s, 0);
 	}
+
+	if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
+		throttle_session(s, 0, 0);
+
 	{                            // Send CDN
 		controlt *c = controlnew(14); // sending CDN
 		control16(c, 1, 3, 1);    // result code (admin reasons - TBA make error, general error, add message
 		control16(c, 14, s, 1);   // assigned session (our end)
 		controladd(c, session[s].tunnel, s); // send the message
 	}
+
+	if (!session[s].die)
+		session[s].die = now() + 150; // Clean up in 15 seconds
+
+	// update filter refcounts
+	if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--;
+	if (session[s].filter_out) ip_filters[session[s].filter_out - 1].used--;
+
 	cluster_send_session(s);
 }
 
 void sendipcp(tunnelidt t, sessionidt s)
 {
-	u8 buf[MAXCONTROL];
-	u16 r = session[s].radius;
-	u8 *q;
+	uint8_t buf[MAXCONTROL];
+	uint16_t r = session[s].radius;
+	uint8_t *q;
 
-	CSTAT(call_sendipcp);
+	CSTAT(sendipcp);
 
 	if (!r)
 		r = radiusnew(s);
@@ -1130,36 +1263,33 @@ void sendipcp(tunnelidt t, sessionidt s)
 	}
 
 	q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
-	if (!q)
-	{
-		log(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");
-		return;
-	}
+	if (!q) return;
 
 	*q = ConfigReq;
 	q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
-	*(u16 *) (q + 2) = htons(10);
+	*(uint16_t *) (q + 2) = htons(10);
 	q[4] = 3;
 	q[5] = 6;
-	*(u32 *) (q + 6) = config->bind_address ? config->bind_address : my_address; // send my IP
+	*(in_addr_t *) (q + 6) = config->peer_address ? config->peer_address :
+				 config->bind_address ? config->bind_address :
+				 my_address; // send my IP
+
 	tunnelsend(buf, 10 + (q - buf), t); // send it
 	session[s].flags &= ~SF_IPCP_ACKED;	// Clear flag.
 }
 
 // kill a session now
-void sessionkill(sessionidt s, char *reason)
+static void sessionkill(sessionidt s, char *reason)
 {
 
-	CSTAT(call_sessionkill);
+	CSTAT(sessionkill);
 
 	session[s].die = now();
 	sessionshutdown(s, reason);  // close radius/routes, etc.
 	if (session[s].radius)
 		radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
 
-	log(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
-
-	throttle_session(s, 0);		// Force session to be un-throttle. Free'ing TBF structures.
+	LOG(2, 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.
@@ -1169,13 +1299,20 @@ void sessionkill(sessionidt s, char *reason)
 	cluster_send_session(s);
 }
 
+static void tunnelclear(tunnelidt t)
+{
+	if (!t) return;
+	memset(&tunnel[t], 0, sizeof(tunnel[t]));
+	tunnel[t].state = TUNNELFREE;
+}
+
 // kill a tunnel now
-void tunnelkill(tunnelidt t, char *reason)
+static void tunnelkill(tunnelidt t, char *reason)
 {
 	sessionidt s;
 	controlt *c;
 
-	CSTAT(call_tunnelkill);
+	CSTAT(tunnelkill);
 
 	tunnel[t].state = TUNNELDIE;
 
@@ -1195,17 +1332,17 @@ void tunnelkill(tunnelidt t, char *reason)
 
 	// free tunnel
 	tunnelclear(t);
-	log(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
+	LOG(1, 0, t, "Kill tunnel %d: %s\n", t, reason);
 	cli_tunnel_actions[s].action = 0;
 	cluster_send_tunnel(t);
 }
 
 // shut down a tunnel cleanly
-void tunnelshutdown(tunnelidt t, char *reason)
+static void tunnelshutdown(tunnelidt t, char *reason)
 {
 	sessionidt s;
 
-	CSTAT(call_tunnelshutdown);
+	CSTAT(tunnelshutdown);
 
 	if (!tunnel[t].last || !tunnel[t].far || tunnel[t].state == TUNNELFREE)
 	{
@@ -1213,12 +1350,12 @@ void tunnelshutdown(tunnelidt t, char *reason)
 		tunnelkill(t, reason);
 		return;
 	}
-	log(1, 0, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
+	LOG(1, 0, t, "Shutting down tunnel %d (%s)\n", t, reason);
 
 	// close session
 	for (s = 1; s < MAXSESSION; s++)
 		if (session[s].tunnel == t)
-			sessionkill(s, reason);
+			sessionshutdown(s, reason);
 
 	tunnel[t].state = TUNNELDIE;
 	tunnel[t].die = now() + 700; // Clean up in 70 seconds
@@ -1226,92 +1363,92 @@ void tunnelshutdown(tunnelidt t, char *reason)
 	// TBA - should we wait for sessions to stop?
 	{                            // Send StopCCN
 		controlt *c = controlnew(4); // sending StopCCN
-		control16(c, 1, 1, 1);    // result code (admin reasons - TBA make error, general error, add message
+		control16(c, 1, 1, 1);    // result code (admin reasons - TBA make error, general error, add message)
 		control16(c, 9, t, 1);    // assigned tunnel (our end)
 		controladd(c, t, 0);      // send the message
 	}
 }
 
 // read and process packet on tunnel (UDP)
-void processudp(u8 * buf, int len, struct sockaddr_in *addr)
+void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 {
 	char *chapresponse = NULL;
-	u16 l = len, t = 0, s = 0, ns = 0, nr = 0;
-	u8 *p = buf + 2;
+	uint16_t l = len, t = 0, s = 0, ns = 0, nr = 0;
+	uint8_t *p = buf + 2;
 
 
-	CSTAT(call_processudp);
+	CSTAT(processudp);
 
 	udp_rx += len;
 	udp_rx_pkt++;
-	log_hex(5, "UDP Data", buf, len);
+	LOG_HEX(5, "UDP Data", buf, len);
 	STAT(tunnel_rx_packets);
 	INC_STAT(tunnel_rx_bytes, len);
 	if (len < 6)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Short UDP, %d bytes\n", len);
+		LOG(1, 0, 0, "Short UDP, %d bytes\n", len);
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	if ((buf[1] & 0x0F) != 2)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
+		LOG(1, 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	if (*buf & 0x40)
 	{                          // length
-		l = ntohs(*(u16 *) p);
+		l = ntohs(*(uint16_t *) p);
 		p += 2;
 	}
-	t = ntohs(*(u16 *) p);
+	t = ntohs(*(uint16_t *) p);
 	p += 2;
-	s = ntohs(*(u16 *) p);
+	s = ntohs(*(uint16_t *) p);
 	p += 2;
 	if (s >= MAXSESSION)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
+		LOG(1, s, t, "Received UDP packet with invalid session ID\n");
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	if (t >= MAXTUNNEL)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
+		LOG(1, s, t, "Received UDP packet with invalid tunnel ID\n");
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	if (*buf & 0x08)
 	{                          // ns/nr
-		ns = ntohs(*(u16 *) p);
+		ns = ntohs(*(uint16_t *) p);
 		p += 2;
-		nr = ntohs(*(u16 *) p);
+		nr = ntohs(*(uint16_t *) p);
 		p += 2;
 	}
 	if (*buf & 0x02)
 	{                          // offset
-		u16 o = ntohs(*(u16 *) p);
+		uint16_t o = ntohs(*(uint16_t *) p);
 		p += o + 2;
 	}
 	if ((p - buf) > l)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
+		LOG(1, s, t, "Bad length %d>%d\n", (int) (p - buf), l);
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	l -= (p - buf);
 	if (*buf & 0x80)
 	{                          // control
-		u16 message = 0xFFFF; // message type
-		u8 fatal = 0;
-		u8 mandatorymessage = 0;
-		u8 chap = 0;      // if CHAP being used
-		u16 asession = 0;  // assigned session
-		u32 amagic = 0;    // magic number
-		u8 aflags = 0;    // flags from last LCF
-		u16 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
+		uint16_t message = 0xFFFF;	// message type
+		uint8_t fatal = 0;
+		uint8_t mandatorymessage = 0;
+		uint8_t chap = 0;		// if CHAP being used
+		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
 
 		if (!config->cluster_iam_master)
 		{
@@ -1321,14 +1458,13 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 
 		if ((*buf & 0xCA) != 0xC8)
 		{
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad control header %02X\n", *buf);
+			LOG(1, s, t, "Bad control header %02X\n", *buf);
 			STAT(tunnel_rx_errors);
 			return;
 		}
-		log(3, ntohl(addr->sin_addr.s_addr), s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
-				l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
-		// if no tunnel specified, assign one
-		if (!t)
+
+		// check for duplicate tunnel open message
+		if (!t && ns == 0)
 		{
 			int i;
 
@@ -1338,28 +1474,52 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			for (i = 1; i <= config->cluster_highest_tunnelid ; ++i)
 			{
 				if (tunnel[i].state != TUNNELOPENING ||
-					tunnel[i].ip != ntohl(*(ipt *) & addr->sin_addr) ||
+					tunnel[i].ip != ntohl(*(in_addr_t *) & addr->sin_addr) ||
 					tunnel[i].port != ntohs(addr->sin_port) )
 					continue;
 				t = i;
+				LOG(3, s, t, "Duplicate SCCRQ?\n");
 				break;
 			}
 		}
 
+		LOG(3, s, t, "Control message (%d bytes): (unacked %d) l-ns %d l-nr %d r-ns %d r-nr %d\n",
+			l, tunnel[t].controlc, tunnel[t].ns, tunnel[t].nr, ns, nr);
+
+		// if no tunnel specified, assign one
 		if (!t)
 		{
 			if (!(t = new_tunnel()))
 			{
-				log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
+				LOG(1, 0, 0, "No more tunnels\n");
 				STAT(tunnel_overflow);
 				return;
 			}
 			tunnelclear(t);
-			tunnel[t].ip = ntohl(*(ipt *) & addr->sin_addr);
+			tunnel[t].ip = ntohl(*(in_addr_t *) & addr->sin_addr);
 			tunnel[t].port = ntohs(addr->sin_port);
 			tunnel[t].window = 4; // default window
-			log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
 			STAT(tunnel_created);
+			LOG(1, 0, t, "   New tunnel from %s:%u ID %d\n",
+				fmtaddr(htonl(tunnel[t].ip), 0), tunnel[t].port, t);
+		}
+
+			// If the 'ns' just received is not the 'nr' we're
+			// expecting, just send an ack and drop it.
+			//
+			// if 'ns' is less, then we got a retransmitted packet.
+			// if 'ns' is greater than missed a packet. Either way
+			// we should ignore it.
+		if (ns != tunnel[t].nr)
+		{
+			// is this the sequence we were expecting?
+			STAT(tunnel_rx_errors);
+			LOG(1, 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n",
+				t, ns, tunnel[t].nr);
+
+			if (l)	// Is this not a ZLB?
+				controlnull(t);
+			return;
 		}
 
 		// This is used to time out old tunnels
@@ -1369,7 +1529,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		{
 			int skip = tunnel[t].window; // track how many in-window packets are still in queue
 				// some to clear maybe?
-			while (tunnel[t].controlc && (((tunnel[t].ns - tunnel[t].controlc) - nr) & 0x8000))
+			while (tunnel[t].controlc > 0 && (((tunnel[t].ns - tunnel[t].controlc) - nr) & 0x8000))
 			{
 				controlt *c = tunnel[t].controls;
 				tunnel[t].controls = c->next;
@@ -1380,22 +1540,6 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				tunnel[t].try = 0; // we have progress
 			}
 
-				// If the 'ns' just received is not the 'nr' we're
-				// expecting, just send an ack and drop it.
-				//
-				// if 'ns' is less, then we got a retransmitted packet.
-				// if 'ns' is greater than missed a packet. Either way
-				// we should ignore it.
-			if (ns != tunnel[t].nr)
-			{
-				// is this the sequence we were expecting?
-				log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
-				STAT(tunnel_rx_errors);
-
-				if (l)	// Is this not a ZLB?
-					controlnull(t);
-				return;
-			}
 			// receiver advance (do here so quoted correctly in any sends below)
 			if (l) tunnel[t].nr = (ns + 1);
 			if (skip < 0) skip = 0;
@@ -1425,14 +1569,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			// process AVPs
 			while (l && !(fatal & 0x80))
 			{
-				u16 n = (ntohs(*(u16 *) p) & 0x3FF);
-				u8 *b = p;
-				u8 flags = *p;
-				u16 mtype;
+				uint16_t n = (ntohs(*(uint16_t *) p) & 0x3FF);
+				uint8_t *b = p;
+				uint8_t flags = *p;
+				uint16_t mtype;
 				p += n;       // next
 				if (l < n)
 				{
-					log(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
+					LOG(1, s, t, "Invalid length in AVP\n");
 					STAT(tunnel_rx_errors);
 					fatal = flags;
 					return;
@@ -1443,17 +1587,17 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					// handle hidden AVPs
 					if (!*config->l2tpsecret)
 					{
-						log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");
+						LOG(1, s, t, "Hidden AVP requested, but no L2TP secret.\n");
 						fatal = flags;
 						continue;
 					}
 					if (!session[s].random_vector_length)
 					{
-						log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
+						LOG(1, s, t, "Hidden AVP requested, but no random vector.\n");
 						fatal = flags;
 						continue;
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
+					LOG(4, s, t, "Hidden AVP\n");
 					// Unhide the AVP
 					n = unhide_avp(b, t, s, n);
 					if (n == 0)
@@ -1464,153 +1608,143 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				}
 				if (*b & 0x3C)
 				{
-					log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);
+					LOG(1, s, t, "Unrecognised AVP flags %02X\n", *b);
 					fatal = flags;
 					continue; // next
 				}
 				b += 2;
-				if (*(u16 *) (b))
+				if (*(uint16_t *) (b))
 				{
-					log(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
+					LOG(2, s, t, "Unknown AVP vendor %d\n", ntohs(*(uint16_t *) (b)));
 					fatal = flags;
 					continue; // next
 				}
 				b += 2;
-				mtype = ntohs(*(u16 *) (b));
+				mtype = ntohs(*(uint16_t *) (b));
 				b += 2;
 				n -= 6;
 
-				log(4, ntohl(addr->sin_addr.s_addr), s, t, "   AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
+				LOG(4, s, t, "   AVP %d (%s) len %d\n", mtype, avp_name(mtype), n);
 				switch (mtype)
 				{
 				case 0:     // message type
-					message = ntohs(*(u16 *) b);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Message type = %d (%s)\n", *b,
-							l2tp_message_types[message]);
+					message = ntohs(*(uint16_t *) b);
+					LOG(4, s, t, "   Message type = %d (%s)\n", *b, l2tp_message_type(message));
 					mandatorymessage = flags;
 					break;
 				case 1:     // result code
 					{
-						u16 rescode = ntohs(*(u16 *)(b));
+						uint16_t rescode = ntohs(*(uint16_t *) b);
 						const char* resdesc = "(unknown)";
 						if (message == 4)
 						{ /* StopCCN */
-							if (rescode <= MAX_STOPCCN_RESULT_CODE)
-								resdesc = stopccn_result_codes[rescode];
+							resdesc = stopccn_result_code(rescode);
 						}
 						else if (message == 14)
 						{ /* CDN */
-							if (rescode <= MAX_CDN_RESULT_CODE)
-								resdesc = cdn_result_codes[rescode];
+							resdesc = cdn_result_code(rescode);
 						}
 
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",
-							rescode, resdesc);
+						LOG(4, s, t, "   Result Code %d: %s\n", rescode, resdesc);
 						if (n >= 4)
 						{
-							u16 errcode = ntohs(*(u16 *)(b + 2));
-							const char* errdesc = "(unknown)";
-							if (errcode <= MAX_ERROR_CODE)
-								errdesc = error_codes[errcode];
-							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",
-								errcode, errdesc);
+							uint16_t errcode = ntohs(*(uint16_t *)(b + 2));
+							LOG(4, s, t, "   Error Code %d: %s\n", errcode, error_code(errcode));
 						}
 						if (n > 4)
-							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %.*s\n",
-								n-4, b+4);
+							LOG(4, s, t, "   Error String: %.*s\n", n-4, b+4);
 
 						break;
 					}
 					break;
 				case 2:     // protocol version
 					{
-						version = ntohs(*(u16 *) (b));
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Protocol version = %d\n", version);
+						version = ntohs(*(uint16_t *) (b));
+						LOG(4, s, t, "   Protocol version = %d\n", version);
 						if (version && version != 0x0100)
 						{   // allow 0.0 and 1.0
-							log(1, ntohl(addr->sin_addr.s_addr), s, t, "   Bad protocol version %04X\n",
-									version);
+							LOG(1, s, t, "   Bad protocol version %04X\n", version);
 							fatal = flags;
 							continue; // next
 						}
 					}
 					break;
 				case 3:     // framing capabilities
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
+//					LOG(4, s, t, "Framing capabilities\n");
 					break;
 				case 4:     // bearer capabilities
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
+//					LOG(4, s, t, "Bearer capabilities\n");
 					break;
 				case 5:		// tie breaker
 					// We never open tunnels, so we don't care about tie breakers
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
+//					LOG(4, s, t, "Tie breaker\n");
 					continue;
 				case 6:     // firmware revision
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
+//					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);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
+					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);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
+					LOG(4, s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
 					break;
 				case 9:     // assigned tunnel
-					tunnel[t].far = ntohs(*(u16 *) (b));
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
+					tunnel[t].far = ntohs(*(uint16_t *) (b));
+					LOG(4, s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
 					break;
 				case 10:    // rx window
-					tunnel[t].window = ntohs(*(u16 *) (b));
+					tunnel[t].window = ntohs(*(uint16_t *) (b));
 					if (!tunnel[t].window)
 						tunnel[t].window = 1; // window of 0 is silly
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   rx window = %d\n", tunnel[t].window);
+					LOG(4, s, t, "   rx window = %d\n", tunnel[t].window);
 					break;
 				case 11:	// Challenge
 					{
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   LAC requested CHAP authentication for tunnel\n");
+						LOG(4, s, t, "   LAC requested CHAP authentication for tunnel\n");
 						build_chap_response(b, 2, n, &chapresponse);
 					}
 					break;
 				case 13:    // Response
 					// Why did they send a response? We never challenge.
-					log(2, ntohl(addr->sin_addr.s_addr), s, t, "   received unexpected challenge response\n");
-				break;
+					LOG(2, s, t, "   received unexpected challenge response\n");
+					break;
 
 				case 14:    // assigned session
-					asession = session[s].far = ntohs(*(u16 *) (b));
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);
+					asession = session[s].far = ntohs(*(uint16_t *) (b));
+					LOG(4, s, t, "   assigned session = %d\n", asession);
 					break;
 				case 15:    // call serial number
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   call serial number = %d\n", ntohl(*(u32 *)b));
+					LOG(4, s, t, "   call serial number = %d\n", ntohl(*(uint32_t *)b));
 					break;
 				case 18:    // bearer type
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   bearer type = %d\n", ntohl(*(u32 *)b));
+					LOG(4, s, t, "   bearer type = %d\n", ntohl(*(uint32_t *)b));
 					// TBA - for RADIUS
 					break;
 				case 19:    // framing type
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   framing type = %d\n", ntohl(*(u32 *)b));
+					LOG(4, s, t, "   framing type = %d\n", ntohl(*(uint32_t *)b));
 					// TBA
 					break;
 				case 21:    // called number
 					memset(called, 0, MAXTEL);
 					memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Called <%s>\n", called);
+					LOG(4, s, t, "   Called <%s>\n", called);
 					break;
 				case 22:    // calling number
 					memset(calling, 0, MAXTEL);
 					memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
+					LOG(4, s, t, "   Calling <%s>\n", calling);
 					break;
 				case 23:    // subtype
 					break;
 				case 24:    // tx connect speed
 					if (n == 4)
 					{
-						session[s].tx_connect_speed = ntohl(*(u32 *)b);
+						session[s].tx_connect_speed = ntohl(*(uint32_t *)b);
 					}
 					else
 					{
@@ -1619,13 +1753,12 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						memcpy(tmp, b, (n >= 30) ? 30 : n);
 						session[s].tx_connect_speed = atol(tmp);
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   TX connect speed <%u>\n",
-							session[s].tx_connect_speed);
+					LOG(4, s, t, "   TX connect speed <%u>\n", session[s].tx_connect_speed);
 					break;
 				case 38:    // rx connect speed
 					if (n == 4)
 					{
-						session[s].rx_connect_speed = ntohl(*(u32 *)b);
+						session[s].rx_connect_speed = ntohl(*(uint32_t *)b);
 					}
 					else
 					{
@@ -1634,42 +1767,39 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						memcpy(tmp, b, (n >= 30) ? 30 : n);
 						session[s].rx_connect_speed = atol(tmp);
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   RX connect speed <%u>\n",
-							session[s].rx_connect_speed);
+					LOG(4, s, t, "   RX connect speed <%u>\n", session[s].rx_connect_speed);
 					break;
 				case 25:    // Physical Channel ID
 					{
-						u32 tmp = ntohl(*(u32 *)b);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Physical Channel ID <%X>\n", tmp);
+						uint32_t tmp = ntohl(*(uint32_t *) b);
+						LOG(4, s, t, "   Physical Channel ID <%X>\n", tmp);
 						break;
 					}
 				case 29:    // Proxy Authentication Type
 					{
-						u16 authtype = ntohs(*(u16 *)b);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Type %d (%s)\n",
-							authtype, authtypes[authtype]);
-						requestchap = (authtype == 2);
+						uint16_t atype = ntohs(*(uint16_t *)b);
+						LOG(4, s, t, "   Proxy Auth Type %d (%s)\n", atype, auth_type(atype));
+						requestchap = (atype == 2);
 						break;
 					}
 				case 30:    // Proxy Authentication Name
 					{
 						char authname[64] = {0};
 						memcpy(authname, b, (n > 63) ? 63 : n);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Name (%s)\n",
+						LOG(4, s, t, "   Proxy Auth Name (%s)\n",
 							authname);
 						break;
 					}
 				case 31:    // Proxy Authentication Challenge
 					{
 						memcpy(radius[session[s].radius].auth, b, 16);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Challenge\n");
+						LOG(4, s, t, "   Proxy Auth Challenge\n");
 						break;
 					}
 				case 32:    // Proxy Authentication ID
 					{
-						u16 authid = ntohs(*(u16 *)(b));
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth ID (%d)\n",
-							authid);
+						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;
 						break;
@@ -1678,56 +1808,40 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					{
 						char authresp[64] = {0};
 						memcpy(authresp, b, (n > 63) ? 63 : n);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Response\n");
+						LOG(4, s, t, "   Proxy Auth Response\n");
 						break;
 					}
 				case 27:    // last send lcp
 					{        // find magic number
-						u8 *p = b, *e = p + n;
-						while (p < e && p[1])
+						uint8_t *p = b, *e = p + n;
+						while (p + 1 < e && p[1] && p + p[1] <= e)
 						{
-							if (*p == 5 && p[1] == 6)
-								amagic = ntohl(*(u32 *) (p + 2));
-							else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5)
+							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 == 7)
+							else if (*p == 7) // Protocol-Field-Compression
 								aflags |= SESSIONPFC;
-							else if (*p == 8)
+							else if (*p == 8) // Address-and-Control-Field-Compression
 								aflags |= SESSIONACFC;
 							p += p[1];
 						}
-
-						{
-							char tmp[500] = {0};
-							tmp[0] = ConfigReq;
-							memcpy((tmp + 1), b, n);
-						}
 					}
 					break;
 				case 28:    // last recv lcp confreq
-					{
-						char tmp[500] = {0};
-						tmp[0] = ConfigReq;
-						memcpy((tmp + 1), b, n);
-						break;
-					}
+					break;
 				case 26:    // Initial Received LCP CONFREQ
-					{
-						char tmp[500] = {0};
-						tmp[0] = ConfigReq;
-						memcpy((tmp + 1), b, n);
-					}
 					break;
 				case 39:    // seq required - we control it as an LNS anyway...
 					break;
 				case 36:    // Random Vector
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Random Vector received. Enabled AVP Hiding.\n");
+					LOG(4, s, t, "   Random Vector received.  Enabled AVP Hiding.\n");
 					memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
 					memcpy(session[s].random_vector, b, n);
 					session[s].random_vector_length = n;
 					break;
 				default:
-					log(2, ntohl(addr->sin_addr.s_addr), s, t, "   Unknown AVP type %d\n", mtype);
+					LOG(2, s, t, "   Unknown AVP type %d\n", mtype);
 					fatal = flags;
 					continue; // next
 				}
@@ -1782,7 +1896,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					}
 					else
 					{
-						u16 r;
+						uint16_t r;
 						controlt *c;
 
 						s = sessionfree;
@@ -1795,7 +1909,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						// make a RADIUS session
 						if (!(r = radiusnew(s)))
 						{
-							log(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
+							LOG(1, s, t, "No free RADIUS sessions for ICRQ\n");
 							sessionkill(s, "no free RADIUS sesions");
 							return;
 						}
@@ -1806,15 +1920,12 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						session[s].tunnel = t;
 						session[s].far = asession;
 						session[s].last_packet = time_now;
-						log(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+						LOG(3, 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
-							int n;
-							for (n = 0; n < 15; n++)
-								radius[r].auth[n] = rand();
-						}
+
+						// 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);
@@ -1828,7 +1939,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					if (amagic == 0) amagic = time_now;
 					session[s].magic = amagic; // set magic number
 					session[s].l2tp_flags = aflags; // set flags received
-					log(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
+					LOG(3, s, t, "Magic %X Flags %X\n", amagic, aflags);
 					controlnull(t); // ack
 					// In CHAP state, request PAP instead
 					if (requestchap)
@@ -1839,14 +1950,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					sessionshutdown(s, "Closed (Received CDN)");
 					break;
 				case 0xFFFF:
-					log(1, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");
+					LOG(1, s, t, "Missing message type\n");
 					break;
 				default:
 					STAT(tunnel_rx_errors);
 					if (mandatorymessage & 0x80)
 						tunnelshutdown(t, "Unknown message");
 					else
-						log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
+						LOG(1, s, t, "Unknown message type %d\n", message);
 					break;
 				}
 			if (chapresponse) free(chapresponse);
@@ -1854,14 +1965,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		else
 		{
-			log(4, 0, s, t, "   Got a ZLB ack\n");
+			LOG(4, s, t, "   Got a ZLB ack\n");
 		}
 	}
 	else
 	{                          // data
-		u16 prot;
+		uint16_t prot;
 
-		log_hex(5, "Receive Tunnel Data", p, l);
+		LOG_HEX(5, "Receive Tunnel Data", p, l);
 		if (l > 2 && p[0] == 0xFF && p[1] == 0x03)
 		{                     // HDLC address header, discard
 			p += 2;
@@ -1869,7 +1980,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		if (l < 2)
 		{
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);
+			LOG(1, s, t, "Short ppp length %d\n", l);
 			STAT(tunnel_rx_errors);
 			return;
 		}
@@ -1880,7 +1991,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		else
 		{
-			prot = ntohs(*(u16 *) p);
+			prot = ntohs(*(uint16_t *) p);
 			p += 2;
 			l -= 2;
 		}
@@ -1895,19 +2006,13 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			}
 
 
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
-					"but no session[%d].tunnel exists (LAC said"
-					" tunnel = %d). Dropping packet.\n", s, s, t);
+			LOG(1, s, t, "UDP packet contains session %d but no session[%d].tunnel "
+				     "exists (LAC said tunnel = %d).  Dropping packet.\n", s, s, t);
+
 			STAT(tunnel_rx_errors);
 			return;
 		}
 
-		if (session[s].die)
-		{
-			log(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
-// I'm pretty sure this isn't right -- mo.
-//			return;              // closing session, PPP not processed
-		}
 		if (prot == PPPPAP)
 		{
 			session[s].last_packet = time_now;
@@ -1940,56 +2045,48 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		else if (prot == PPPIP)
 		{
-			if (!config->cluster_iam_master)
+			if (session[s].die)
 			{
-				// We're a slave. Should we forward this packet to the master?
-
-				// Is this a walled garden session, or something that needs it's
-				// idle time updated??
+				LOG(4, s, t, "Session %d is closing.  Don't process PPP packets\n", s);
+				return;              // closing session, PPP not processed
+			}
 
-				// Maintain the idle timeouts on the master. If this would
-				// significantly reset the idletimeout, run it via the master
-				// to refresh the master's idle timer.
-				// Not sure this is ideal: It may re-order packets.
+			session[s].last_packet = time_now;
+			if (session[s].walled_garden && !config->cluster_iam_master)
+			{
+				master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
+				return;
+			}
 
-				if (session[s].walled_garden || (session[s].last_packet + (ECHO_TIMEOUT/2)) < time_now)
-				{
-					master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
-					session[s].last_packet = time_now;
-					return;
-				}
-				// fall through to processipin.
-			} else
-				session[s].last_packet = time_now;
 			processipin(t, s, p, l);
 		}
 		else
 		{
 			STAT(tunnel_rx_errors);
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
+			LOG(1, s, t, "Unknown PPP protocol %04X\n", prot);
 		}
 	}
 }
 
 // read and process packet on tun
-void processtun(u8 * buf, int len)
+static void processtun(uint8_t * buf, int len)
 {
-	log_hex(5, "Receive TUN Data", buf, len);
+	LOG_HEX(5, "Receive TUN Data", buf, len);
 	STAT(tun_rx_packets);
 	INC_STAT(tun_rx_bytes, len);
 
-	CSTAT(call_processtun);
+	CSTAT(processtun);
 
 	eth_rx_pkt++;
 	eth_rx += len;
 	if (len < 22)
 	{
-		log(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
+		LOG(1, 0, 0, "Short tun packet %d bytes\n", len);
 		STAT(tun_rx_errors);
 		return;
 	}
 
-	if (*(u16 *) (buf + 2) == htons(PKTIP)) // IP
+	if (*(uint16_t *) (buf + 2) == htons(PKTIP)) // IPv4
 		processipout(buf, len);
 	// Else discard.
 }
@@ -2000,16 +2097,17 @@ void processtun(u8 * buf, int len)
 // at once.
 #define MAX_ACTIONS 500
 
-int regular_cleanups(void)
+static int regular_cleanups(void)
 {
 	static sessionidt s = 0;	// Next session to check for actions on.
 	tunnelidt t;
 	int count=0,i;
-	u16 r;
+	uint16_t r;
 	static clockt next_acct = 0;
+	static clockt next_shut_acct = 0;
 	int a;
 
-	log(3, 0, 0, 0, "Begin regular cleanup\n");
+	LOG(3, 0, 0, "Begin regular cleanup\n");
 
 	for (r = 1; r < MAXRADIUS; r++)
 	{
@@ -2038,7 +2136,7 @@ int regular_cleanups(void)
 			if (tunnel[t].retry <= TIME)
 			{
 				controlt *c = tunnel[t].controls;
-				u8 w = tunnel[t].window;
+				uint8_t w = tunnel[t].window;
 				tunnel[t].try++; // another try
 				if (tunnel[t].try > 5)
 					tunnelkill(t, "Timeout on control message"); // game over
@@ -2055,7 +2153,7 @@ int regular_cleanups(void)
 		{
 			controlt *c = controlnew(6); // sending HELLO
 			controladd(c, t, 0); // send the message
-			log(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");
+			LOG(3, 0, t, "Sending HELLO message\n");
 		}
 
 		// Check for tunnel changes requested from the CLI
@@ -2064,7 +2162,7 @@ int regular_cleanups(void)
 			cli_tunnel_actions[t].action = 0;
 			if (a & CLI_TUN_KILL)
 			{
-				log(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
+				LOG(2, 0, t, "Dropping tunnel by CLI\n");
 				tunnelshutdown(t, "Requested by administrator");
 			}
 		}
@@ -2084,7 +2182,7 @@ int regular_cleanups(void)
 		if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
 		{
 			// IPCP has not completed yet. Resend
-			log(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
+			LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
 			sendipcp(session[s].tunnel, s);
 		}
 
@@ -2099,7 +2197,7 @@ int regular_cleanups(void)
 		// Drop sessions who have not responded within IDLE_TIMEOUT seconds
 		if (session[s].last_packet && (time_now - session[s].last_packet >= IDLE_TIMEOUT))
 		{
-			sessionkill(s, "No response to LCP ECHO requests");
+			sessionshutdown(s, "No response to LCP ECHO requests");
 			STAT(session_timeout);
 			if (++count >= MAX_ACTIONS) break;
 			continue;
@@ -2108,21 +2206,17 @@ int regular_cleanups(void)
 		// No data in IDLE_TIMEOUT seconds, send LCP ECHO
 		if (session[s].user[0] && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
 		{
-			u8 b[MAXCONTROL] = {0};
+			uint8_t b[MAXCONTROL] = {0};
 
-			u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
-			if (!q)
-			{
-				log(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
-				continue;
-			}
+			uint8_t *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
+			if (!q) continue;
 
 			*q = EchoReq;
-			*(u8 *)(q + 1) = (time_now % 255); // ID
-			*(u16 *)(q + 2) = htons(8); // Length
-			*(u32 *)(q + 4) = 0; // Magic Number (not supported)
+			*(uint8_t *)(q + 1) = (time_now % 255); // ID
+			*(uint16_t *)(q + 2) = htons(8); // Length
+			*(uint32_t *)(q + 4) = 0; // Magic Number (not supported)
 
-			log(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
+			LOG(4, 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;
@@ -2136,42 +2230,59 @@ int regular_cleanups(void)
 			cli_session_actions[s].action = 0;
 			if (a & CLI_SESS_KILL)
 			{
-				log(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
+				LOG(2, s, session[s].tunnel, "Dropping session by CLI\n");
 				sessionshutdown(s, "Requested by administrator");
 				a = 0; // dead, no need to check for other actions
 			}
 
-			if (a & CLI_SESS_SNOOP)
+			if (a & CLI_SESS_NOSNOOP)
+			{
+				LOG(2, s, session[s].tunnel, "Unsnooping session by CLI\n");
+				session[s].snoop_ip = 0;
+				session[s].snoop_port = 0;
+				send++;
+			}
+			else if (a & CLI_SESS_SNOOP)
 			{
-				log(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
-				    inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
+				LOG(2, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+				    fmtaddr(cli_session_actions[s].snoop_ip, 0),
+				    cli_session_actions[s].snoop_port);
 
 				session[s].snoop_ip = cli_session_actions[s].snoop_ip;
 				session[s].snoop_port = cli_session_actions[s].snoop_port;
 				send++;
 			}
 
-			if (a & CLI_SESS_NOSNOOP)
+			if (a & CLI_SESS_NOTHROTTLE)
 			{
-				log(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
-				session[s].snoop_ip = 0;
-				session[s].snoop_port = 0;
+				LOG(2, s, session[s].tunnel, "Un-throttling session by CLI\n");
+				throttle_session(s, 0, 0);
 				send++;
 			}
-
-			if (a & CLI_SESS_THROTTLE)
+			else if (a & CLI_SESS_THROTTLE)
 			{
-				log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
-				    cli_session_actions[s].throttle & 0xFFFF,
-				    cli_session_actions[s].throttle >> 16);
+				LOG(2, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
+				    cli_session_actions[s].throttle_in,
+				    cli_session_actions[s].throttle_out);
 
-				throttle_session(s, cli_session_actions[s].throttle);
+				throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);
+				send++;
 			}
 
-			if (a & CLI_SESS_NOTHROTTLE)
+			if (a & CLI_SESS_NOFILTER)
+			{
+				LOG(2, s, session[s].tunnel, "Un-filtering session by CLI\n");
+				filter_session(s, 0, 0);
+				send++;
+			}
+			else if (a & CLI_SESS_FILTER)
 			{
-				log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
-				throttle_session(s, 0);
+				LOG(2, s, session[s].tunnel, "Filtering session by CLI (in=%d, out=%d)\n",
+				    cli_session_actions[s].filter_in,
+				    cli_session_actions[s].filter_out);
+
+				filter_session(s, cli_session_actions[s].filter_in, cli_session_actions[s].filter_out);
+				send++;
 			}
 
 			if (send)
@@ -2181,17 +2292,28 @@ int regular_cleanups(void)
 		}
 	}
 
-	if (*config->accounting_dir && next_acct <= TIME)
+	if (*config->accounting_dir)
 	{
-		// Dump accounting data
-		next_acct = TIME + ACCT_TIME;
-		dump_acct_info();
+		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)
+		{
+			// Dump accounting data for shutdown sessions
+			next_shut_acct = TIME + ACCT_SHUT_TIME;
+			if (shut_acct_n)
+				dump_acct_info(0);
+		}
 	}
 
 	if (count >= MAX_ACTIONS)
 		return 1;	// Didn't finish!
 
-	log(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
+	LOG(3, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
 	return 0;
 }
 
@@ -2200,7 +2322,7 @@ int regular_cleanups(void)
 // Are we in the middle of a tunnel update, or radius
 // requests??
 //
-int still_busy(void)
+static int still_busy(void)
 {
 	int i;
 	static clockt last_talked = 0;
@@ -2215,16 +2337,16 @@ int still_busy(void)
 
 		if (last_talked != TIME)
 		{
-			log(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
+			LOG(2, 0, 0, "Tunnel %d still has un-acked control messages.\n", i);
 			last_talked = TIME;
 		}
 		return 1;
 	}
 
-	// We stop waiting for radius after BUSY_WAIT_TIMEOUT 1/10th seconds
-	if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIMEOUT)
+	// We stop waiting for radius after BUSY_WAIT_TIME 1/10th seconds
+	if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIME)
 	{
-		log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
+		LOG(1, 0, 0, "Giving up waiting for RADIUS to be empty.  Shutting down anyway.\n");
 		return 0;
 	}
 
@@ -2237,7 +2359,7 @@ int still_busy(void)
 
 		if (last_talked != TIME)
 		{
-			log(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
+			LOG(2, 0, 0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
 			last_talked = TIME;
 		}
 		return 1;
@@ -2246,42 +2368,37 @@ int still_busy(void)
 	return 0;
 }
 
+static fd_set readset;
+static int readset_n = 0;
+
 // main loop - gets packets on tun or udp and processes them
-void mainloop(void)
+static void mainloop(void)
 {
-	fd_set cr;
-	int cn, i;
-	u8 buf[65536];
+	int i;
+	uint8_t buf[65536];
 	struct timeval to;
 	clockt next_cluster_ping = 0;	// send initial ping immediately
 	time_t next_clean = time_now + config->cleanup_interval;
 
-	log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
-			udpfd, tunfd, cluster_sockfd, controlfd);
-
-	FD_ZERO(&cr);
-	FD_SET(udpfd, &cr);
-	FD_SET(tunfd, &cr);
-	FD_SET(controlfd, &cr);
-	FD_SET(clifd, &cr);
-	if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
-	cn = udpfd;
-	if (cn < tunfd) cn = tunfd;
-	if (cn < controlfd) cn = controlfd;
-	if (cn < clifd) cn = clifd;
-	if (cn < cluster_sockfd) cn = cluster_sockfd;
-	for (i = 0; i < config->num_radfds; i++)
-	{
-		if (!radfds[i]) continue;
-		FD_SET(radfds[i], &cr);
-		if (radfds[i] > cn)
-			cn = radfds[i];
-	}
+	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;
 
 	while (!main_quit || still_busy())
 	{
 		fd_set r;
-		int n = cn;
+		int n = readset_n;
 #ifdef BGP
 		fd_set w;
 		int bgp_set[BGP_NUM_PEERS];
@@ -2293,7 +2410,7 @@ void mainloop(void)
 			update_config();
 		}
 
-		memcpy(&r, &cr, sizeof(fd_set));
+		memcpy(&r, &readset, sizeof(fd_set));
 		to.tv_sec = 0;
 		to.tv_usec = 100000; // 1/10th of a second.
 
@@ -2322,74 +2439,137 @@ void mainloop(void)
 		n = select(n + 1, &r, 0, 0, &to);
 #endif /* BGP */
 
+		STAT(select_called);
+
 		TIME = now();
 		if (n < 0)
 		{
-			if (errno == EINTR)
+			if (errno == EINTR ||
+			    errno == ECHILD) // EINTR was clobbered by sigchild_handler()
 				continue;
 
-			log(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
+			LOG(0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
 			main_quit++;
 			break;
 		}
 		else if (n)
 		{
 			struct sockaddr_in addr;
-			int alen = sizeof(addr);
-			if (FD_ISSET(udpfd, &r))
+			int alen, c, s;
+			int udp_pkts = 0;
+			int tun_pkts = 0;
+			int cluster_pkts = 0;
+
+			// 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)
 			{
-				int c, n;
-				for (c = 0; c < config->multi_read_count; c++)
+				for (i = 0; i < config->num_radfds; i++)
 				{
-					if ((n = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
-						processudp(buf, n, &addr);
-					else
-						break;
+					if (FD_ISSET(radfds[i], &r))
+					{
+						processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
+						n--;
+					}
 				}
 			}
-			if (FD_ISSET(tunfd, &r))
+
+			// CLI connections
+			if (FD_ISSET(clifd, &r))
 			{
-				int c, n;
-				for (c = 0; c < config->multi_read_count; c++)
+				int cli;
+				
+				alen = sizeof(addr);
+				if ((cli = accept(clifd, (struct sockaddr *)&addr, &alen)) >= 0)
 				{
-					if ((n = read(tunfd, buf, sizeof(buf))) > 0)
-						processtun(buf, n);
-					else
-						break;
+					cli_do(cli);
+					close(cli);
 				}
+				else
+					LOG(0, 0, 0, "accept error: %s\n", strerror(errno));
+
+				n--;
 			}
-			for (i = 0; i < config->num_radfds; i++)
-				if (FD_ISSET(radfds[i], &r))
-					processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
 
-			if (FD_ISSET(cluster_sockfd, &r))
+#ifdef BGP
+			for (i = 0; i < BGP_NUM_PEERS; i++)
 			{
-				int size;
-				size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
-				processcluster(buf, size, addr.sin_addr.s_addr);
+				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--;
 			}
+#endif /* BGP */
 
-			if (FD_ISSET(controlfd, &r))
-				processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
-
-			if (FD_ISSET(clifd, &r))
+			for (c = 0; n && c < config->multi_read_count; c++)
 			{
-				struct sockaddr_in addr;
-				int sockfd;
-				int len = sizeof(addr);
-
-				if ((sockfd = accept(clifd, (struct sockaddr *)&addr, &len)) <= 0)
-				{
-					log(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
-					continue;
-				}
-				else
+				// L2TP
+				if (FD_ISSET(udpfd, &r))
 				{
-					cli_do(sockfd);
-					close(sockfd);
+					alen = sizeof(addr);
+					if ((s = recvfrom(udpfd, buf, sizeof(buf), 0, (void *) &addr, &alen)) > 0)
+					{
+						processudp(buf, s, &addr);
+						udp_pkts++;
+					}
+					else
+					{
+						FD_CLR(udpfd, &r);
+						n--;
+					}
 				}
-			}
-		}
+
+				// incoming IP
+				if (FD_ISSET(tunfd, &r))
+				{
+					if ((s = read(tunfd, buf, sizeof(buf))) > 0)
+					{
+						processtun(buf, s);
+					    	tun_pkts++;
+					}
+					else
+					{
+						FD_CLR(tunfd, &r);
+						n--;
+					}
+				}
+
+				// cluster
+				if (FD_ISSET(cluster_sockfd, &r))
+				{
+					alen = sizeof(addr);
+					if ((s = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen)) > 0)
+					{
+						processcluster(buf, s, addr.sin_addr.s_addr);
+						cluster_pkts++;
+					}
+					else
+					{
+						FD_CLR(cluster_sockfd, &r);
+						n--;
+					}
+				}
+			}
+
+			if (udp_pkts > 1 || tun_pkts > 1 || cluster_pkts > 1)
+				STAT(multi_read_used);
+
+			if (c >= config->multi_read_count)
+			{
+				LOG(3, 0, 0, "Reached multi_read_count (%d); processed %d udp, %d tun and %d cluster packets\n",
+					config->multi_read_count, udp_pkts, tun_pkts, cluster_pkts);
+
+				STAT(multi_read_exceeded);
+			}
+		}
 
 			// Runs on every machine (master and slaves).
 		if (cluster_sockfd && next_cluster_ping <= TIME)
@@ -2438,15 +2618,6 @@ void mainloop(void)
 				next_clean = time_now + config->cleanup_interval; // Did. Move to next interval.
 			}
 		}
-
-#ifdef BGP
-		for (i = 0; i < BGP_NUM_PEERS; i++)
-		{
-			bgp_process(&bgp_peers[i],
-				bgp_set[i] ? FD_ISSET(bgp_peers[i].sock, &r) : 0,
-				bgp_set[i] ? FD_ISSET(bgp_peers[i].sock, &w) : 0);
-		}
-#endif /* BGP */
 	}
 
 		// Are we the master and shutting down??
@@ -2461,61 +2632,134 @@ void mainloop(void)
 	// Important!!! We MUST not process any packets past this point!
 }
 
+static void stripdomain(char *host)
+{
+	char *p;
+
+	if ((p = strchr(host, '.')))
+	{
+		char *domain = 0;
+		char _domain[1024];
+
+		// strip off domain
+		FILE *resolv = fopen("/etc/resolv.conf", "r");
+		if (resolv)
+		{
+			char buf[1024];
+			char *b;
+
+			while (fgets(buf, sizeof(buf), resolv))
+			{
+				if (strncmp(buf, "domain", 6) && strncmp(buf, "search", 6))
+					continue;
+
+				if (!isspace(buf[6]))
+					continue;
+
+				b = buf + 7;
+				while (isspace(*b)) b++;
+
+				if (*b)
+				{
+					char *d = b;
+					while (*b && !isspace(*b)) b++;
+					*b = 0;
+					if (buf[0] == 'd') // domain is canonical
+					{
+						domain = d;
+						break;
+					}
+
+					// first search line
+					if (!domain)
+					{
+						// hold, may be subsequent domain line
+						strncpy(_domain, d, sizeof(_domain))[sizeof(_domain)-1] = 0;
+						domain = _domain;
+					}
+				}
+			}
+
+			fclose(resolv);
+		}
+
+		if (domain)
+		{
+			int hl = strlen(host);
+			int dl = strlen(domain);
+			if (dl < hl && host[hl - dl - 1] == '.' && !strcmp(host + hl - dl, domain))
+				host[hl -dl - 1] = 0;
+		}
+		else
+		{
+			*p = 0; // everything after first dot
+		}
+	}
+}
+
 // Init data structures
-void initdata(int optdebug, char *optconfig)
+static void initdata(int optdebug, char *optconfig)
 {
 	int i;
 
 	if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
 		exit(1);
 	}
-	if (!(config = shared_malloc(sizeof(struct configt))))
+	if (!(config = shared_malloc(sizeof(configt))))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
 		exit(1);
 	}
-	memset(config, 0, sizeof(struct configt));
+	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
+	strcpy(config->random_device, RANDOMDEVICE);
 
 	if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
 		exit(1);
 	}
 	if (!(session = shared_malloc(sizeof(sessiont) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for sessions: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for sessions: %s\n", strerror(errno));
 		exit(1);
 	}
 
-	if (!(sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)))
+	if (!(sess_local = shared_malloc(sizeof(sessionlocalt) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for sessions_count: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for sess_local: %s\n", strerror(errno));
 		exit(1);
 	}
 
 	if (!(radius = shared_malloc(sizeof(radiust) * MAXRADIUS)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for radius: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for radius: %s\n", strerror(errno));
 		exit(1);
 	}
 
 	if (!(ip_address_pool = shared_malloc(sizeof(ippoolt) * MAXIPPOOL)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	if (!(ip_filters = shared_malloc(sizeof(ip_filtert) * MAXFILTER)))
+	{
+		LOG(0, 0, 0, "Error doing malloc for ip_filters: %s\n", strerror(errno));
 		exit(1);
 	}
+	memset(ip_filters, 0, sizeof(ip_filtert) * MAXFILTER);
 
 #ifdef RINGBUFFER
 	if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(ringbuffer, 0, sizeof(struct Tringbuffer));
@@ -2523,14 +2767,14 @@ void initdata(int optdebug, char *optconfig)
 
 	if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
 
 	if (!(cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);
@@ -2555,10 +2799,9 @@ void initdata(int optdebug, char *optconfig)
 
 	if (!*hostname)
 	{
-		char *p;
 		// Grab my hostname unless it's been specified
 		gethostname(hostname, sizeof(hostname));
-		if ((p = strchr(hostname, '.'))) *p = 0;
+		stripdomain(hostname);
 	}
 
 	_statistics->start_time = _statistics->last_reset = time(NULL);
@@ -2566,30 +2809,22 @@ void initdata(int optdebug, char *optconfig)
 #ifdef BGP
 	if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
 		exit(1);
 	}
 #endif /* BGP */
 }
 
-void initiptables(void)
-{
-	/* Flush the tables here so that we have a clean slate */
-
-// Not needed. 'nat' is setup by garden.c
-// mangle isn't used (as throttling is done by tbf inhouse).
-}
-
-int assign_ip_address(sessionidt s)
+static int assign_ip_address(sessionidt s)
 {
-	u32 i;
+	uint32_t i;
 	int best = -1;
 	time_t best_time = time_now;
 	char *u = session[s].user;
 	char reuse = 0;
 
 
-	CSTAT(call_assign_ip_address);
+	CSTAT(assign_ip_address);
 
 	for (i = 1; i < ip_pool_size; i++)
 	{
@@ -2613,7 +2848,7 @@ int assign_ip_address(sessionidt s)
 
 	if (best < 0)
 	{
-		log(0, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
+		LOG(0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
 		return 0;
 	}
 
@@ -2631,16 +2866,19 @@ int assign_ip_address(sessionidt s)
 		strncpy(ip_address_pool[best].user, u, sizeof(ip_address_pool[best].user) - 1);
 
 	STAT(ip_allocated);
-	log(4, ip_address_pool[best].address, s, session[s].tunnel,
-		"assign_ip_address(): %s ip address %d from pool\n", reuse ? "Reusing" : "Allocating", best);
+	LOG(4, s, session[s].tunnel, "assign_ip_address(): %s ip address %d from pool\n",
+		reuse ? "Reusing" : "Allocating", best);
 
 	return 1;
 }
 
-void free_ip_address(sessionidt s)
+static void free_ip_address(sessionidt s)
 {
 	int i = session[s].ip_pool_index;
 
+
+	CSTAT(free_ip_address);
+
 	if (!session[s].ip)
 		return; // what the?
 
@@ -2653,10 +2891,6 @@ void free_ip_address(sessionidt s)
 	ip_address_pool[i].assigned = 0;
 	ip_address_pool[i].session = 0;
 	ip_address_pool[i].last = time_now;
-
-
-	CSTAT(call_free_ip_address);
-
 }
 
 //
@@ -2696,8 +2930,8 @@ void rebuild_address_pool(void)
 			if (ipid < 1)			// Not found in the pool either? good.
 				continue;
 
-			log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
-				i, inet_toa(session[i].ip), ipid);
+			LOG(0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
+				i, fmtaddr(session[i].ip, 0), ipid);
 
 			// Fall through and process it as part of the pool.
 		}
@@ -2705,7 +2939,7 @@ void rebuild_address_pool(void)
 
 		if (ipid > MAXIPPOOL || ipid < 0)
 		{
-			log(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
+			LOG(0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
 			ipid = -1;
 			session[i].ip_pool_index = ipid;
 			continue;
@@ -2723,7 +2957,7 @@ void rebuild_address_pool(void)
 //
 // Fix the address pool to match a changed session.
 // (usually when the master sends us an update).
-void fix_address_pool(int sid)
+static void fix_address_pool(int sid)
 {
 	int ipid;
 
@@ -2744,7 +2978,7 @@ void fix_address_pool(int sid)
 //
 // Add a block of addresses to the IP pool to hand out.
 //
-void add_to_ip_pool(u32 addr, u32 mask)
+static void add_to_ip_pool(in_addr_t addr, in_addr_t mask)
 {
 	int i;
 	if (mask == 0)
@@ -2765,14 +2999,14 @@ void add_to_ip_pool(u32 addr, u32 mask)
 		++ip_pool_size;
 		if (ip_pool_size >= MAXIPPOOL)
 		{
-			log(0,0,0,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );
+			LOG(0, 0, 0, "Overflowed IP pool adding %s\n", fmtaddr(htonl(addr), 0));
 			return;
 		}
 	}
 }
 
 // Initialize the IP address pool
-void initippool()
+static void initippool()
 {
 	FILE *f;
 	char *p;
@@ -2781,7 +3015,7 @@ void initippool()
 
 	if (!(f = fopen(IPPOOLFILE, "r")))
 	{
-		log(0, 0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
+		LOG(0, 0, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
 		exit(1);
 	}
 
@@ -2795,12 +3029,12 @@ void initippool()
 		if ((p = (char *)strrchr(buf, '\n'))) *p = 0;
 		if ((p = (char *)strchr(buf, ':')))
 		{
-			ipt src;
+			in_addr_t src;
 			*p = '\0';
 			src = inet_addr(buf);
 			if (src == INADDR_NONE)
 			{
-				log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
+				LOG(0, 0, 0, "Invalid address pool IP %s\n", buf);
 				exit(1);
 			}
 			// This entry is for a specific IP only
@@ -2813,20 +3047,22 @@ void initippool()
 		{
 			// It's a range
 			int numbits = 0;
-			u32 start = 0, mask = 0;
+			in_addr_t start = 0, mask = 0;
 
-			log(2, 0, 0, 0, "Adding IP address range %s\n", buf);
+			LOG(2, 0, 0, "Adding IP address range %s\n", buf);
 			*p++ = 0;
 			if (!*p || !(numbits = atoi(p)))
 			{
-				log(0, 0, 0, 0, "Invalid pool range %s\n", buf);
+				LOG(0, 0, 0, "Invalid pool range %s\n", buf);
 				continue;
 			}
 			start = ntohl(inet_addr(pool));
-			mask = (u32)(pow(2, numbits) - 1) << (32 - numbits);
+			mask = (in_addr_t) (pow(2, numbits) - 1) << (32 - numbits);
 
 			// Add a static route for this pool
-			log(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
+			LOG(5, 0, 0, "Adding route for address pool %s/%u\n",
+				fmtaddr(htonl(start), 0), 32 + mask);
+
 			routeset(0, start, mask, 0, 1);
 
 			add_to_ip_pool(start, mask);
@@ -2838,10 +3074,10 @@ void initippool()
 		}
 	}
 	fclose(f);
-	log(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
+	LOG(1, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
 }
 
-void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
+void snoop_send_packet(char *packet, uint16_t size, in_addr_t destination, uint16_t port)
 {
 	struct sockaddr_in snoop_addr = {0};
 	if (!destination || !port || snoopfd <= 0 || size <= 0 || !packet)
@@ -2851,62 +3087,81 @@ void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 	snoop_addr.sin_addr.s_addr = destination;
 	snoop_addr.sin_port = ntohs(port);
 
-	log(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",
-			packet, size, inet_toa(snoop_addr.sin_addr.s_addr), htons(snoop_addr.sin_port));
+	LOG(5, 0, 0, "Snooping %d byte packet to %s:%d\n", size,
+		fmtaddr(snoop_addr.sin_addr.s_addr, 0),
+		htons(snoop_addr.sin_port));
+
 	if (sendto(snoopfd, packet, size, MSG_DONTWAIT | MSG_NOSIGNAL, (void *) &snoop_addr, sizeof(snoop_addr)) < 0)
-		log(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
+
 	STAT(packets_snooped);
 }
 
-void dump_acct_info()
+static int dump_session(FILE **f, sessiont *s)
 {
-	char filename[1024];
-	char timestr[64];
-	time_t t = time(NULL);
-	int i;
-	FILE *f = NULL;
-
+	if (!s->opened || !s->ip || !(s->cin || s->cout) || !*s->user || s->walled_garden)
+		return 1;
 
-	CSTAT(call_dump_acct_info);
+	if (!*f)
+	{
+		char filename[1024];
+		char timestr[64];
+		time_t now = time(NULL);
 
-	strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
-	snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);
+		strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", localtime(&now));
+		snprintf(filename, sizeof(filename), "%s/%s", config->accounting_dir, timestr);
 
-	for (i = 0; i < MAXSESSION; i++)
-	{
-		if (!session[i].opened || !session[i].ip || (!session[i].cin && !session[i].cout) || !*session[i].user || session[i].walled_garden)
-			continue;
-		if (!f)
+		if (!(*f = fopen(filename, "w")))
 		{
-			time_t now = time(NULL);
-			if (!(f = fopen(filename, "w")))
-			{
-				log(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
-				return ;
-			}
-			log(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
-			fprintf(f, "# dslwatch.pl dump file V1.01\n"
-			        "# host: %s\n"
-			        "# time: %ld\n"
-			        "# uptime: %ld\n"
-			        "# format: username ip qos uptxoctets downrxoctets\n",
-			        hostname,
-			        now,
-			        now - basetime);
+			LOG(0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
+			return 0;
 		}
 
-		log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
-		fprintf(f, "%s %s %d %u %u\n",
-		        session[i].user,		// username
-		        inet_toa(htonl(session[i].ip)),	// ip
-		        (session[i].throttle) ? 2 : 1,	// qos
-		        (u32)session[i].cin,		// uptxoctets
-		        (u32)session[i].cout);		// downrxoctets
+		LOG(3, 0, 0, "Dumping accounting information to %s\n", filename);
+		fprintf(*f, "# dslwatch.pl dump file V1.01\n"
+			"# host: %s\n"
+			"# time: %ld\n"
+			"# uptime: %ld\n"
+			"# format: username ip qos uptxoctets downrxoctets\n",
+			hostname,
+			now,
+			now - basetime);
+	}
+
+	LOG(4, 0, 0, "Dumping accounting information for %s\n", s->user);
+	fprintf(*f, "%s %s %d %u %u\n",
+		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
 
-		session[i].pin = session[i].cin = 0;
-		session[i].pout = session[i].cout = 0;
+	s->pin = s->cin = 0;
+	s->pout = s->cout = 0;
+
+	return 1;
+}
+
+static void dump_acct_info(int all)
+{
+	int i;
+	FILE *f = NULL;
+
+
+	CSTAT(dump_acct_info);
+
+	if (shut_acct_n)
+	{
+		for (i = 0; i < shut_acct_n; i++)
+			dump_session(&f, &shut_acct[i]);
+
+		shut_acct_n = 0;
 	}
 
+	if (all)
+		for (i = 1; i <= config->cluster_highest_sessionid; i++)
+			dump_session(&f, &session[i]);
+
 	if (f)
 		fclose(f);
 }
@@ -2914,43 +3169,42 @@ void dump_acct_info()
 // Main program
 int main(int argc, char *argv[])
 {
-	int o;
+	int i;
 	int optdebug = 0;
 	char *optconfig = CONFIGFILE;
 
-	_program_name = strdup(argv[0]);
-
 	time(&basetime);             // start clock
 
 	// scan args
-	while ((o = getopt(argc, argv, "dvc:h:")) >= 0)
+	while ((i = getopt(argc, argv, "dvc:h:")) >= 0)
 	{
-		switch (o)
+		switch (i)
 		{
-			case 'd':
-				// Double fork to detach from terminal
-				if (fork()) exit(0);
-				if (fork()) exit(0);
-				break;
-			case 'v':
-				optdebug++;
-				break;
-			case 'c':
-			    	optconfig = optarg;
-				break;
-			case 'h':
-				snprintf(hostname, sizeof(hostname), "%s", optarg);
-				break;
-			default:
-				printf("Args are:\n"
-				       "\t-d\tDetach from terminal\n"
-				       "\t-c <file>\tConfig file\n"
-				       "\t-h <hostname>\tForce hostname\n"
-				       "\t-a <address>\tUse specific address\n"
-				       "\t-v\t\tDebug\n");
-
-				return (0);
-				break;
+		case 'd':
+			if (fork()) exit(0);
+			setsid();
+			freopen("/dev/null", "r", stdin);
+			freopen("/dev/null", "w", stdout);
+			freopen("/dev/null", "w", stderr);
+			break;
+		case 'v':
+			optdebug++;
+			break;
+		case 'c':
+			optconfig = optarg;
+			break;
+		case 'h':
+			snprintf(hostname, sizeof(hostname), "%s", optarg);
+			break;
+		default:
+			printf("Args are:\n"
+			       "\t-d\t\tDetach from terminal\n"
+			       "\t-c <file>\tConfig file\n"
+			       "\t-h <hostname>\tForce hostname\n"
+			       "\t-v\t\tDebug\n");
+
+			return (0);
+			break;
 		}
 	}
 
@@ -2960,24 +3214,24 @@ int main(int argc, char *argv[])
 	signal(SIGALRM, sigalrm_handler);
 	siginterrupt(SIGALRM, 0);
 
-	initiptables();
 	initplugins();
 	initdata(optdebug, optconfig);
 
+	init_cli(hostname);
 	read_config_file();
 	init_tbf(config->num_tbfs);
-	init_cli(hostname);
 
-	log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
-	log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
-	log(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+	LOG(0, 0, 0, "L2TPNS version " VERSION "\n");
+	LOG(0, 0, 0, "Copyright (c) 2003, 2004, 2005 Optus Internet Engineering\n");
+	LOG(0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
 	{
 		struct rlimit rlim;
 		rlim.rlim_cur = RLIM_INFINITY;
 		rlim.rlim_max = RLIM_INFINITY;
 		// Remove the maximum core size
 		if (setrlimit(RLIMIT_CORE, &rlim) < 0)
-			log(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
+			LOG(0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
+
 		// Make core dumps go to /tmp
 		chdir("/tmp");
 	}
@@ -2990,42 +3244,42 @@ int main(int argc, char *argv[])
 
 		if (get_nprocs() < 2)
 		{
-			log(0, 0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
+			LOG(0, 0, 0, "Not using FIFO scheduler, there is only 1 processor in the system.\n");
 			config->scheduler_fifo = 0;
 		}
 		else
 		{
 			if ((ret = sched_setscheduler(0, SCHED_FIFO, &params)) == 0)
 			{
-				log(1, 0, 0, 0, "Using FIFO scheduler. Say goodbye to any other processes running\n");
+				LOG(1, 0, 0, "Using FIFO scheduler.  Say goodbye to any other processes running\n");
 			}
 			else
 			{
-				log(0, 0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
+				LOG(0, 0, 0, "Error setting scheduler to FIFO: %s\n", strerror(errno));
 				config->scheduler_fifo = 0;
 			}
 		}
 	}
 
 	/* Set up the cluster communications port. */
-	if (cluster_init(config->bind_address) < 0)
+	if (cluster_init() < 0)
 		exit(1);
 
 #ifdef BGP
 	signal(SIGPIPE, SIG_IGN);
 	bgp_setup(config->as_number);
 	bgp_add_route(config->bind_address, 0xffffffff);
-	if (*config->bgp_peer[0])
-		bgp_start(&bgp_peers[0], config->bgp_peer[0],
-		    config->bgp_peer_as[0], 0); /* 0 = routing disabled */
-
-	if (*config->bgp_peer[1])
-		bgp_start(&bgp_peers[1], config->bgp_peer[1],
-		    config->bgp_peer_as[1], 0);
+	for (i = 0; i < BGP_NUM_PEERS; i++)
+	{
+		if (config->neighbour[i].name[0])
+			bgp_start(&bgp_peers[i], config->neighbour[i].name,
+				config->neighbour[i].as, config->neighbour[i].keepalive,
+				config->neighbour[i].hold, 0); /* 0 = routing disabled */
+	}
 #endif /* BGP */
 
 	inittun();
-	log(1, 0, 0, 0, "Set up on interface %s\n", config->tundevice);
+	LOG(1, 0, 0, "Set up on interface %s\n", config->tundevice);
 
 	initudp();
 	initrad();
@@ -3043,9 +3297,9 @@ int main(int argc, char *argv[])
 	if (config->lock_pages)
 	{
 		if (!mlockall(MCL_CURRENT))
-			log(1, 0, 0, 0, "Locking pages into memory\n");
+			LOG(1, 0, 0, "Locking pages into memory\n");
 		else
-			log(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
+			LOG(0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
 	}
 
 	alarm(1);
@@ -3059,12 +3313,9 @@ int main(int argc, char *argv[])
 #ifdef BGP
 	/* try to shut BGP down cleanly; with luck the sockets will be
 	   writable since we're out of the select */
-	{
-		int i;
-		for (i = 0; i < BGP_NUM_PEERS; i++)
-			if (bgp_peers[i].state == Established)
-				bgp_stop(&bgp_peers[i]);
-	}
+	for (i = 0; i < BGP_NUM_PEERS; i++)
+		if (bgp_peers[i].state == Established)
+			bgp_stop(&bgp_peers[i]);
 #endif /* BGP */
 
 	/* remove plugins (so cleanup code gets run) */
@@ -3080,7 +3331,7 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
-void sighup_handler(int junk)
+static void sighup_handler(int sig)
 {
 	if (log_stream && log_stream != stderr)
 	{
@@ -3091,7 +3342,7 @@ void sighup_handler(int junk)
 	read_config_file();
 }
 
-void sigalrm_handler(int junk)
+static void sigalrm_handler(int sig)
 {
 	// Log current traffic stats
 
@@ -3124,48 +3375,52 @@ void sigalrm_handler(int junk)
 
 }
 
-void sigterm_handler(int junk)
+static void sigterm_handler(int sig)
 {
-	log(1, 0, 0, 0, "Shutting down cleanly\n");
+	LOG(1, 0, 0, "Shutting down cleanly\n");
 	if (config->save_state)
 		dump_state();
 
 	main_quit++;
 }
 
-void sigquit_handler(int junk)
+static void sigquit_handler(int sig)
 {
 	int i;
 
-	log(1, 0, 0, 0, "Shutting down without saving sessions\n");
-	for (i = 1; i < MAXSESSION; i++)
-	{
-		if (session[i].opened)
-			sessionkill(i, "L2TPNS Closing");
-	}
-	for (i = 1; i < MAXTUNNEL; i++)
+	LOG(1, 0, 0, "Shutting down without saving sessions\n");
+
+	if (config->cluster_iam_master)
 	{
-		if (tunnel[i].ip || tunnel[i].state)
-			tunnelshutdown(i, "L2TPNS Closing");
+		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");
+		}
 	}
 
 	main_quit++;
 }
 
-void sigchild_handler(int signal)
+static void sigchild_handler(int sig)
 {
 	while (waitpid(-1, NULL, WNOHANG) > 0)
 	    ;
 }
 
-void read_state()
+static void read_state()
 {
 	struct stat sb;
 	int i;
 	ippoolt itmp;
 	FILE *f;
 	char magic[sizeof(DUMP_MAGIC) - 1];
-	u32 buf[2];
+	uint32_t buf[2];
 
 	if (!config->save_state)
 	{
@@ -3181,7 +3436,7 @@ void read_state()
 
 	if (sb.st_mtime < (time(NULL) - 60))
 	{
-		log(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+		LOG(0, 0, 0, "State file is too old to read, ignoring\n");
 		unlink(STATEFILE);
 		return ;
 	}
@@ -3191,41 +3446,41 @@ void read_state()
 
 	if (!f)
 	{
-		log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
+		LOG(0, 0, 0, "Can't read state file: %s\n", strerror(errno));
 		exit(1);
 	}
 
 	if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
 	{
-		log(0, 0, 0, 0, "Bad state file magic\n");
+		LOG(0, 0, 0, "Bad state file magic\n");
 		exit(1);
 	}
 
-	log(1, 0, 0, 0, "Reading state information\n");
+	LOG(1, 0, 0, "Reading state information\n");
 	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
 	{
-		log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
+		LOG(0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
 		exit(1);
 	}
 
 	if (buf[0] > ip_pool_size)
 	{
-		log(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
+		LOG(0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
 		exit(1);
 	}
 
-	log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
+	LOG(2, 0, 0, "Loading %u ip addresses\n", buf[0]);
 	for (i = 0; i < buf[0]; i++)
 	{
 		if (fread(&itmp, sizeof(itmp), 1, f) != 1)
 		{
-			log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
+			LOG(0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
 			exit(1);
 		}
 
 		if (itmp.address != ip_address_pool[i].address)
 		{
-			log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
+			LOG(0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
 			exit(1);
 		}
 
@@ -3234,14 +3489,14 @@ void read_state()
 
 	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
 	{
-		log(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
+		LOG(0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
 		exit(1);
 	}
 
-	log(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
+	LOG(2, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
 	if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
 	{
-		log(0, 0, 0, 0, "Error reading tunnel data from state file\n");
+		LOG(0, 0, 0, "Error reading tunnel data from state file\n");
 		exit(1);
 	}
 
@@ -3251,19 +3506,19 @@ void read_state()
 		tunnel[i].controls = NULL;
 		tunnel[i].controle = NULL;
 		if (*tunnel[i].hostname)
-			log(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
+			LOG(3, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
 	}
 
 	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
 	{
-		log(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
+		LOG(0, 0, 0, "Error/mismatch reading session header from state file\n");
 		exit(1);
 	}
 
-	log(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
+	LOG(2, 0, 0, "Loading %u sessions\n", MAXSESSION);
 	if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
 	{
-		log(0, 0, 0, 0, "Error reading session data from state file\n");
+		LOG(0, 0, 0, "Error reading session data from state file\n");
 		exit(1);
 	}
 
@@ -3273,20 +3528,20 @@ void read_state()
 		session[i].tbf_out = 0;
 		if (session[i].opened)
 		{
-			log(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
+			LOG(2, i, 0, "Loaded active session for user %s\n", session[i].user);
 			if (session[i].ip)
 				sessionsetup(session[i].tunnel, i);
 		}
 	}
 
 	fclose(f);
-	log(0, 0, 0, 0, "Loaded saved state information\n");
+	LOG(0, 0, 0, "Loaded saved state information\n");
 }
 
-void dump_state()
+static void dump_state()
 {
 	FILE *f;
-	u32 buf[2];
+	uint32_t buf[2];
 
 	if (!config->save_state)
 		return;
@@ -3296,12 +3551,12 @@ void dump_state()
 		if (!(f = fopen(STATEFILE, "w")))
 			break;
 
-		log(1, 0, 0, 0, "Dumping state information\n");
+		LOG(1, 0, 0, "Dumping state information\n");
 
 		if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
 			break;
 
-		log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
+		LOG(2, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
 		buf[0] = ip_pool_size;
 		buf[1] = sizeof(ippoolt);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3309,7 +3564,7 @@ void dump_state()
 		if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size)
 			break;
 
-		log(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
+		LOG(2, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
 		buf[0] = MAXTUNNEL;
 		buf[1] = sizeof(tunnelt);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3317,7 +3572,7 @@ void dump_state()
 		if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
 			break;
 
-		log(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
+		LOG(2, 0, 0, "Dumping %u sessions\n", MAXSESSION);
 		buf[0] = MAXSESSION;
 		buf[1] = sizeof(sessiont);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3330,22 +3585,22 @@ void dump_state()
 	}
 	while (0);
 
-	log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
+	LOG(0, 0, 0, "Can't write state information: %s\n", strerror(errno));
 	unlink(STATEFILE);
 }
 
-void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)
+static void build_chap_response(char *challenge, uint8_t id, uint16_t challenge_length, char **challenge_response)
 {
 	MD5_CTX ctx;
 	*challenge_response = NULL;
 
 	if (!*config->l2tpsecret)
 	{
-		log(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
+		LOG(0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
 		return;
 	}
 
-	log(4, 0, 0, 0, "   Building challenge response for CHAP request\n");
+	LOG(4, 0, 0, "   Building challenge response for CHAP request\n");
 
 	*challenge_response = (char *)calloc(17, 1);
 
@@ -3369,9 +3624,10 @@ static int facility_value(char *name)
 	return 0;
 }
 
-void update_config()
+static void update_config()
 {
 	int i;
+	char *p;
 	static int timeout = 0;
 	static int interval = 0;
 
@@ -3383,6 +3639,7 @@ void update_config()
 		fclose(log_stream);
 		log_stream = NULL;
 	}
+
 	if (*config->log_filename)
 	{
 		if (strstr(config->log_filename, "syslog:") == config->log_filename)
@@ -3414,7 +3671,6 @@ void update_config()
 		setbuf(log_stream, NULL);
 	}
 
-
 	// Update radius
 	config->numradiusservers = 0;
 	for (i = 0; i < MAXRADSERVER; i++)
@@ -3435,17 +3691,69 @@ void update_config()
 		}
 
 	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;
+	while (*p)
+	{
+		char *s = strpbrk(p, " \t,");
+		int type = 0;
+
+		if (s)
+		{
+			*s++ = 0;
+			while (*s == ' ' || *s == '\t')
+				s++;
+
+			if (!*s)
+				s = 0;
+		}
+
+		if (!strncasecmp("chap", p, strlen(p)))
+			type = AUTHCHAP;
+		else if (!strncasecmp("pap", p, strlen(p)))
+			type = AUTHPAP;
+		else
+			LOG(0, 0, 0, "Invalid RADIUS authentication type \"%s\"", p);
+
+		config->radius_authtypes |= type;
+		if (!config->radius_authprefer)
+			config->radius_authprefer = type;
+	}
+
+	if (!config->radius_authtypes)
 	{
-		log(0, 0, 0, 0, "No RADIUS servers defined!\n");
+		LOG(0, 0, 0, "Defaulting to PAP authentication\n");
+		config->radius_authtypes = config->radius_authprefer = AUTHPAP;
 	}
 
-	config->num_radfds = 2 << RADIUS_SHIFT;
+	// normalise radius_authtypes_s
+	if (config->radius_authprefer == AUTHPAP)
+	{
+		strcpy(config->radius_authtypes_s, "pap");
+		if (config->radius_authtypes & AUTHCHAP)
+			strcat(config->radius_authtypes_s, ", chap");
+	}
+	else
+	{
+		strcpy(config->radius_authtypes_s, "chap");
+		if (config->radius_authtypes & AUTHPAP)
+			strcat(config->radius_authtypes_s, ", pap");
+	}
+
+	// re-initialise the random number source
+	initrandom(config->random_device);
 
 	// Update plugins
 	for (i = 0; i < MAXPLUGINS; i++)
 	{
 		if (strcmp(config->plugins[i], config->old_plugins[i]) == 0)
 			continue;
+
 		if (*config->plugins[i])
 		{
 			// Plugin added
@@ -3457,6 +3765,7 @@ void update_config()
 			remove_plugin(config->old_plugins[i]);
 		}
 	}
+
 	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;
@@ -3478,7 +3787,7 @@ void update_config()
 
 		if (config->cluster_hb_timeout < t)
 		{
-			log(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
+			LOG(0, 0, 0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
 			config->cluster_hb_timeout = t;
 		}
 
@@ -3502,14 +3811,14 @@ void update_config()
 		}
 		else
 		{
-			log(0, 0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
+			LOG(0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
 		}
 	}
 
 	config->reload_config = 0;
 }
 
-void read_config_file()
+static void read_config_file()
 {
 	FILE *f;
 
@@ -3520,9 +3829,9 @@ void read_config_file()
 		return;
 	}
 
-	log(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
+	LOG(3, 0, 0, "Reading config file %s\n", config->config_file);
 	cli_do_file(f);
-	log(3, 0, 0, 0, "Done reading config file\n");
+	LOG(3, 0, 0, "Done reading config file\n");
 	fclose(f);
 	update_config();
 }
@@ -3530,27 +3839,26 @@ void read_config_file()
 int sessionsetup(tunnelidt t, sessionidt s)
 {
 	// A session now exists, set it up
-	ipt ip;
+	in_addr_t ip;
 	char *user;
 	sessionidt i;
 	int r;
 
-	CSTAT(call_sessionsetup);
+	CSTAT(sessionsetup);
 
-	log(3, session[s].ip, s, t, "Doing session setup for session\n");
+	LOG(3, s, t, "Doing session setup for session\n");
 
 	if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
 	{
 		assign_ip_address(s);
-		if (session[s].ip)
-			log(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
-					inet_toa(htonl(session[s].ip)));
-		else
+		if (!session[s].ip)
 		{
-			log(0, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
+			LOG(0, s, t, "   No IP allocated.  The IP address pool is FULL!\n");
 			sessionshutdown(s, "No IP addresses available");
 			return 0;
 		}
+		LOG(3, s, t, "   No IP allocated.  Assigned %s from pool\n",
+			fmtaddr(htonl(session[s].ip), 0));
 	}
 
 
@@ -3572,23 +3880,35 @@ int sessionsetup(tunnelidt t, sessionidt s)
 		}
 	}
 
+	{
+	    	int routed = 0;
+
 		// Add the route for this session.
-		//
-		// Static IPs need to be routed. Anything else
-		// is part of the IP address pool and is already routed,
-		// it just needs to be added to the IP cache.
-	if (session[s].ip_pool_index == -1) // static ip
-		routeset(s, session[s].ip, 0, 0, 1);
-	else
-		cache_ipmap(session[s].ip, s);
+		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
+		{
+			if ((session[s].ip & session[s].route[r].mask) ==
+			    (session[s].route[r].ip & session[s].route[r].mask))
+				routed++;
+
+			routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 1);
+		}
 
-	for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
-		routeset(s, session[s].route[r].ip, session[s].route[r].mask, session[s].ip, 1);
+		// Static IPs need to be routed if not already
+		// convered by a Framed-Route.  Anything else is part
+		// of the IP address pool and is already routed, it
+		// just needs to be added to the IP cache.
+		if (session[s].ip_pool_index == -1) // static ip
+		{
+			if (!routed) routeset(s, session[s].ip, 0, 0, 1);
+		}
+		else
+			cache_ipmap(session[s].ip, s);
+	}
 
 	if (!session[s].unique_id)
 	{
 		// did this session just finish radius?
-		log(3, session[s].ip, s, t, "Sending initial IPCP to client\n");
+		LOG(3, s, t, "Sending initial IPCP to client\n");
 		sendipcp(t, s);
 		session[s].unique_id = ++last_id;
 	}
@@ -3599,22 +3919,15 @@ int sessionsetup(tunnelidt t, sessionidt s)
 		run_plugins(PLUGIN_NEW_SESSION, &data);
 	}
 
-	// Force throttling on or off (Actually : refresh the current throttling status)
-	// This has the advantage of cleaning up after another throttled user who may have left
-	// firewall rules lying around
-	throttle_session(s, session[s].throttle);
+	// Allocate TBFs if throttled
+	if (session[s].throttle_in || session[s].throttle_out)
+		throttle_session(s, session[s].throttle_in, session[s].throttle_out);
 
 	session[s].last_packet = time_now;
 
-	{
-		char *sessionip, *tunnelip;
-		sessionip = strdup(inet_toa(htonl(session[s].ip)));
-		tunnelip = strdup(inet_toa(htonl(tunnel[t].ip)));
-		log(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
-				session[s].user, sessionip, tunnelip, tunnel[t].hostname);
-		if (sessionip) free(sessionip);
-		if (tunnelip) free(tunnelip);
-	}
+	LOG(2, s, t, "Login by %s at %s from %s (%s)\n", session[s].user,
+		fmtaddr(htonl(session[s].ip), 0),
+		fmtaddr(htonl(tunnel[t].ip), 1), tunnel[t].hostname);
 
 	cluster_send_session(s);	// Mark it as dirty, and needing to the flooded to the cluster.
 
@@ -3628,12 +3941,13 @@ int sessionsetup(tunnelidt t, sessionidt s)
 int load_session(sessionidt s, sessiont *new)
 {
 	int i;
+	int newip = 0;
 
 		// Sanity checks.
 	if (new->ip_pool_index >= MAXIPPOOL ||
 		new->tunnel >= MAXTUNNEL)
 	{
-		log(0,0,s,0, "Strange session update received!\n");
+		LOG(0, s, 0, "Strange session update received!\n");
 			// FIXME! What to do here?
 		return 0;
 	}
@@ -3645,52 +3959,101 @@ int load_session(sessionidt s, sessiont *new)
 
 	session[s].tunnel = new->tunnel; // For logging in cache_ipmap
 
+	// See if routes/ip cache need updating
+	if (new->ip != session[s].ip)
+		newip++;
+
+	for (i = 0; !newip && i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
+		if (new->route[i].ip != session[s].route[i].ip ||
+		    new->route[i].mask != session[s].route[i].mask)
+			newip++;
 
-	if (new->ip != session[s].ip)	// Changed ip. fix up hash tables.
+	// needs update
+	if (newip)
 	{
-		if (session[s].ip)	// If there's an old one, remove it.
+	    	int routed = 0;
+
+		// remove old routes...
+		for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
 		{
-			// Remove any routes if the IP has changed
-			for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
-			{
-				routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
-				session[s].route[i].ip = 0;
-			}
+			if ((session[s].ip & session[s].route[i].mask) ==
+			    (session[s].route[i].ip & session[s].route[i].mask))
+				routed++;
+
+			routeset(s, session[s].route[i].ip, session[s].route[i].mask, 0, 0);
+		}
 
+		// ...ip
+		if (session[s].ip)
+		{
 			if (session[s].ip_pool_index == -1) // static IP
-				routeset(s, session[s].ip, 0, 0, 0);
+			{
+				if (!routed) routeset(s, session[s].ip, 0, 0, 0);
+			}
 			else		// It's part of the IP pool, remove it manually.
 				uncache_ipmap(session[s].ip);
 		}
 
+		routed = 0;
+
+		// add new routes...
+		for (i = 0; i < MAXROUTE && new->route[i].ip; i++)
+		{
+			if ((new->ip & new->route[i].mask) ==
+			    (new->route[i].ip & new->route[i].mask))
+				routed++;
+
+			routeset(s, new->route[i].ip, new->route[i].mask, 0, 1);
+		}
+
+		// ...ip
 		if (new->ip)
 		{
 			// If there's a new one, add it.
 			if (new->ip_pool_index == -1)
-				routeset(s, new->ip, 0, 0, 1);
+			{
+				if (!routed) routeset(s, new->ip, 0, 0, 1);
+			}
 			else
 				cache_ipmap(new->ip, s);
 		}
 	}
 
-	// Update routed networks
-	for (i = 0; i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
+	// check filters
+	if (new->filter_in && (new->filter_in > MAXFILTER || !ip_filters[new->filter_in - 1].name[0]))
 	{
-		if (new->route[i].ip == session[s].route[i].ip &&
-		    new->route[i].mask == session[s].route[i].mask)
-			continue;
+		LOG(2, s, session[s].tunnel, "Dropping invalid input filter %d\n", (int) new->filter_in);
+		new->filter_in = 0;
+	}
 
-		if (session[s].route[i].ip) // Remove the old one if it exists.
-			routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
+	if (new->filter_out && (new->filter_out > MAXFILTER || !ip_filters[new->filter_out - 1].name[0]))
+	{
+		LOG(2, s, session[s].tunnel, "Dropping invalid output filter %d\n", (int) new->filter_out);
+		new->filter_out = 0;
+	}
 
-		if (new->route[i].ip)	// Add the new one if it exists.
-			routeset(s, new->route[i].ip, new->route[i].mask, new->ip, 1);
+	if (new->filter_in != session[s].filter_in)
+	{
+		if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--;
+		if (new->filter_in)       ip_filters[new->filter_in - 1].used++;
+	}
+
+	if (new->filter_out != session[s].filter_out)
+	{
+		if (session[s].filter_out) ip_filters[session[s].filter_out - 1].used--;
+		if (new->filter_out)       ip_filters[new->filter_out - 1].used++;
 	}
 
 	if (new->tunnel && s > config->cluster_highest_sessionid)	// Maintain this in the slave. It's used
 					// for walking the sessions to forward byte counts to the master.
 		config->cluster_highest_sessionid = s;
 
+	// TEMP: old session struct used a 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.
@@ -3700,22 +4063,7 @@ int load_session(sessionidt s, sessiont *new)
 	return 1;
 }
 
-#ifdef RINGBUFFER
-void ringbuffer_dump(FILE *stream)
-{
-	int i = ringbuffer->head;
-
-	while (i != ringbuffer->tail)
-	{
-		if (*ringbuffer->buffer[i].message)
-			fprintf(stream, "%d-%s", ringbuffer->buffer[i].level, ringbuffer->buffer[i].message);
-		if (++i == ringbuffer->tail) break;
-		if (i == RINGBUFFER_SIZE) i = 0;
-	}
-}
-#endif
-
-void initplugins()
+static void initplugins()
 {
 	int i;
 
@@ -3730,22 +4078,48 @@ static void *open_plugin(char *plugin_name, int load)
 	char path[256] = "";
 
 	snprintf(path, 256, PLUGINDIR "/%s.so", plugin_name);
-	log(2, 0, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);
+	LOG(2, 0, 0, "%soading plugin from %s\n", load ? "L" : "Un-l", path);
 	return dlopen(path, RTLD_NOW);
 }
 
-void add_plugin(char *plugin_name)
+// plugin callback to get a config value
+static void *getconfig(char *key, enum config_typet type)
+{
+	int i;
+
+	for (i = 0; config_values[i].key; i++)
+	{
+		if (!strcmp(config_values[i].key, key))
+		{
+			if (config_values[i].type == type)
+				return ((void *) config) + config_values[i].offset;
+
+			LOG(1, 0, 0, "plugin requested config item \"%s\" expecting type %d, have type %d\n",
+				key, type, config_values[i].type);
+
+			return 0;
+		}
+	}
+
+	LOG(1, 0, 0, "plugin requested unknown config item \"%s\"\n", key);
+	return 0;
+}
+
+static int add_plugin(char *plugin_name)
 {
 	static struct pluginfuncs funcs = {
 		_log,
 		_log_hex,
-		inet_toa,
+		fmtaddr,
 		sessionbyuser,
 		sessiontbysessionidt,
 		sessionidtbysessiont,
-		sessionkill,
 		radiusnew,
 		radiussend,
+		getconfig,
+		sessionkill,
+		throttle_session,
+		cluster_send_session,
 	};
 
 	void *p = open_plugin(plugin_name, 1);
@@ -3754,23 +4128,23 @@ void add_plugin(char *plugin_name)
 
 	if (!p)
 	{
-		log(1, 0, 0, 0, "   Plugin load failed: %s\n", dlerror());
-		return;
+		LOG(1, 0, 0, "   Plugin load failed: %s\n", dlerror());
+		return -1;
 	}
 
 	if (ll_contains(loaded_plugins, p))
 	{
 		dlclose(p);
-		return;
+		return 0; // already loaded
 	}
 
 	{
-		int *v = dlsym(p, "__plugin_api_version");
+		int *v = dlsym(p, "plugin_api_version");
 		if (!v || *v != PLUGIN_API_VERSION)
 		{
-			log(1, 0, 0, 0, "   Plugin load failed: API version mismatch: %s\n", dlerror());
+			LOG(1, 0, 0, "   Plugin load failed: API version mismatch: %s\n", dlerror());
 			dlclose(p);
-			return;
+			return -1;
 		}
 	}
 
@@ -3778,9 +4152,9 @@ void add_plugin(char *plugin_name)
 	{
 		if (!initfunc(&funcs))
 		{
-			log(1, 0, 0, 0, "   Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
+			LOG(1, 0, 0, "   Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
 			dlclose(p);
-			return;
+			return -1;
 		}
 	}
 
@@ -3791,12 +4165,13 @@ void add_plugin(char *plugin_name)
 		void *x;
 		if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
 		{
-			log(3, 0, 0, 0, "   Supports function \"%s\"\n", plugin_functions[i]);
+			LOG(3, 0, 0, "   Supports function \"%s\"\n", plugin_functions[i]);
 			ll_push(plugins[i], x);
 		}
 	}
 
-	log(2, 0, 0, 0, "   Loaded plugin %s\n", plugin_name);
+	LOG(2, 0, 0, "   Loaded plugin %s\n", plugin_name);
+	return 1;
 }
 
 static void run_plugin_done(void *plugin)
@@ -3807,48 +4182,54 @@ static void run_plugin_done(void *plugin)
 		donefunc();
 }
 
-void remove_plugin(char *plugin_name)
+static int remove_plugin(char *plugin_name)
 {
 	void *p = open_plugin(plugin_name, 0);
-	int i;
+	int loaded = 0;
 
 	if (!p)
-		return;
-
-	for (i = 0; i < max_plugin_functions; i++)
-	{
-		void *x;
-		if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
-			ll_delete(plugins[i], x);
-	}
+		return -1;
 
 	if (ll_contains(loaded_plugins, p))
 	{
+		int i;
+		for (i = 0; i < max_plugin_functions; i++)
+		{
+			void *x;
+			if (plugin_functions[i] && (x = dlsym(p, plugin_functions[i])))
+				ll_delete(plugins[i], x);
+		}
+
 		ll_delete(loaded_plugins, p);
 		run_plugin_done(p);
+		loaded = 1;
 	}
 
 	dlclose(p);
-	log(2, 0, 0, 0, "Removed plugin %s\n", plugin_name);
+	LOG(2, 0, 0, "Removed plugin %s\n", plugin_name);
+	return loaded;
 }
 
 int run_plugins(int plugin_type, void *data)
 {
 	int (*func)(void *data);
-	if (!plugins[plugin_type] || plugin_type > max_plugin_functions) return 1;
+
+	if (!plugins[plugin_type] || plugin_type > max_plugin_functions)
+		return PLUGIN_RET_ERROR;
 
 	ll_reset(plugins[plugin_type]);
 	while ((func = ll_next(plugins[plugin_type])))
 	{
-		int rc;
-		rc = func(data);
-		if (rc == PLUGIN_RET_STOP) return 1;
-		if (rc == PLUGIN_RET_ERROR) return 0;
+		int r = func(data);
+
+		if (r != PLUGIN_RET_OK)
+			return r; // stop here
 	}
-	return 1;
+
+	return PLUGIN_RET_OK;
 }
 
-void plugins_done()
+static void plugins_done()
 {
 	void *p;
 
@@ -3857,83 +4238,192 @@ void plugins_done()
 		run_plugin_done(p);
 }
 
-void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
+static void processcontrol(uint8_t * buf, int len, struct sockaddr_in *addr, int alen)
 {
-	char *resp;
-	int l;
-	struct param_control param = { buf, len, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), NULL, 0, 0 };
-
+	struct nsctl request;
+	struct nsctl response;
+	int type = unpack_control(&request, buf, len);
+	int r;
+	void *p;
 
 	if (log_stream && config->debug >= 4)
 	{
-		log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
-		dump_packet(buf, log_stream);
+		if (type < 0)
+		{
+			LOG(4, 0, 0, "Bogus control message from %s (%d)\n",
+				fmtaddr(addr->sin_addr.s_addr, 0), type);
+		}
+		else
+		{
+			LOG(4, 0, 0, "Received [%s] ", fmtaddr(addr->sin_addr.s_addr, 0));
+			dump_control(&request, log_stream);
+		}
 	}
 
-	resp = calloc(1400, 1);
-	l = new_packet(PKT_RESP_ERROR, resp);
-	*(int *)(resp + 6) = *(int *)(buf + 6);
+	switch (type)
+	{
+	case NSCTL_REQ_LOAD:
+		if (request.argc != 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = "name of plugin required";
+		}
+		else if ((r = add_plugin(request.argv[0])) < 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = !r
+				? "plugin already loaded"
+				: "error loading plugin";
+		}
+		else
+		{
+			response.type = NSCTL_RES_OK;
+			response.argc = 0;
+		}
+
+		break;
 
-	param.type = ntohs(*(short *)(buf + 2));
-	param.id = ntohl(*(int *)(buf + 6));
-	param.data_length = ntohs(*(short *)(buf + 4)) - 10;
-	param.data = (param.data_length > 0) ? (char *)(buf + 10) : NULL;
-	param.response = resp;
-	param.response_length = l;
+	case NSCTL_REQ_UNLOAD:
+		if (request.argc != 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = "name of plugin required";
+		}
+		else if ((r = remove_plugin(request.argv[0])) < 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = !r
+				? "plugin not loaded"
+				: "plugin not found";
+		}
+		else
+		{
+			response.type = NSCTL_RES_OK;
+			response.argc = 0;
+		}
 
-	run_plugins(PLUGIN_CONTROL, &param);
+		break;
 
-	if (param.send_response)
-	{
-		send_packet(controlfd, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), param.response, param.response_length);
-		log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");
-	}
+	case NSCTL_REQ_HELP:
+		response.type = NSCTL_RES_OK;
+		response.argc = 0;
 
-	free(resp);
-}
+		ll_reset(loaded_plugins);
+		while ((p = ll_next(loaded_plugins)))
+		{
+			char **help = dlsym(p, "plugin_control_help");
+			while (response.argc < 0xff && help && *help)
+				response.argv[response.argc++] = *help++;
+		}
 
-/*
- * HACK
- * Go through all of the tunnels and do some cleanups
- */
-void tunnel_clean()
-{
-	int i;
+		break;
 
-	log(1, 0, 0, 0, "Cleaning tunnels array\n");
+	case NSCTL_REQ_CONTROL:
+		{
+			struct param_control param = {
+				config->cluster_iam_master,
+				request.argc,
+				request.argv,
+				0,
+				NULL,
+			};
 
-	for (i = 1; i < MAXTUNNEL; i++)
+			int r = run_plugins(PLUGIN_CONTROL, &param);
+
+			if (r == PLUGIN_RET_ERROR)
+			{
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				response.argv[0] = param.additional
+					? param.additional
+					: "error returned by plugin";
+			}
+			else if (r == PLUGIN_RET_NOTMASTER)
+			{
+				static char msg[] = "must be run on master: 000.000.000.000";
+
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				if (config->cluster_master_address)
+				{
+					strcpy(msg + 23, fmtaddr(config->cluster_master_address, 0));
+					response.argv[0] = msg;
+				}
+				else
+				{
+				    	response.argv[0] = "must be run on master: none elected";
+				}
+			}
+			else if (!(param.response & NSCTL_RESPONSE))
+			{
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				response.argv[0] = param.response
+					? "unrecognised response value from plugin"
+					: "unhandled action";
+			}
+			else
+			{
+				response.type = param.response;
+				response.argc = 0;
+				if (param.additional)
+				{
+					response.argc = 1;
+					response.argv[0] = param.additional;
+				}
+			}
+		}
+
+		break;
+
+	default:
+		response.type = NSCTL_RES_ERR;
+		response.argc = 1;
+		response.argv[0] = "error unpacking control packet";
+	}
+
+	buf = calloc(NSCTL_MAX_PKT_SZ, 1);
+	if (!buf)
+	{
+		LOG(2, 0, 0, "Failed to allocate nsctl response\n");
+		return;
+	}
+
+	r = pack_control(buf, NSCTL_MAX_PKT_SZ, response.type, response.argc, response.argv);
+	if (r > 0)
 	{
-		if (!tunnel[i].ip
-				|| !*tunnel[i].hostname
-				|| (tunnel[i].state == TUNNELDIE && tunnel[i].die >= time_now))
+		sendto(controlfd, buf, r, 0, (const struct sockaddr *) addr, alen);
+		if (log_stream && config->debug >= 4)
 		{
-			tunnelclear(i);
+			LOG(4, 0, 0, "Sent [%s] ", fmtaddr(addr->sin_addr.s_addr, 0));
+			dump_control(&response, log_stream);
 		}
 	}
-}
+	else
+		LOG(2, 0, 0, "Failed to pack nsctl response for %s (%d)\n",
+			fmtaddr(addr->sin_addr.s_addr, 0), r);
 
-void tunnelclear(tunnelidt t)
-{
-	if (!t) return;
-	memset(&tunnel[t], 0, sizeof(tunnel[t]));
-	tunnel[t].state = TUNNELFREE;
+	free(buf);
 }
 
-tunnelidt new_tunnel()
+static tunnelidt new_tunnel()
 {
 	tunnelidt i;
 	for (i = 1; i < MAXTUNNEL; i++)
 	{
 		if (tunnel[i].state == TUNNELFREE)
 		{
-			log(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
+			LOG(4, 0, i, "Assigning tunnel ID %d\n", i);
 			if (i > config->cluster_highest_tunnelid)
 				config->cluster_highest_tunnelid = i;
 			return i;
 		}
 	}
-	log(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
+	LOG(0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
 	return 0;
 }
 
@@ -3946,19 +4436,32 @@ tunnelidt new_tunnel()
 //
 void become_master(void)
 {
-	int s;
+	int s, i;
 	run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
-	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	// running a bunch of iptables commands is slow and can cause
+	// the master to drop tunnels on takeover--kludge around the
+	// problem by forking for the moment (note: race)
+	if (!fork_and_close())
 	{
-		if (!session[s].tunnel) // Not an in-use session.
-			continue;
+		for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+		{
+			if (!session[s].tunnel) // Not an in-use session.
+				continue;
 
-		run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+			run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+		}
+		exit(0);
 	}
-}
-
 
+	// add radius fds
+	for (i = 0; i < config->num_radfds; i++)
+	{
+		FD_SET(radfds[i], &readset);
+		if (radfds[i] > readset_n)
+			readset_n = radfds[i];
+	}
+}
 
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc)
 {
@@ -4047,16 +4550,16 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
  *
  * Based on code from rp-l2tpd by Roaring Penguin Software Inc.
  */
-int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length)
+static int unhide_avp(uint8_t *avp, tunnelidt t, sessionidt s, uint16_t length)
 {
 	MD5_CTX ctx;
-	u8 *cursor;
-	u8 digest[16];
-	u8 working_vector[16];
+	uint8_t *cursor;
+	uint8_t digest[16];
+	uint8_t working_vector[16];
 	uint16_t hidden_length;
-	u8 type[2];
+	uint8_t type[2];
 	size_t done, todo;
-	u8 *output;
+	uint8_t *output;
 
 	// Find the AVP type.
 	type[0] = *(avp + 4);
@@ -4082,7 +4585,7 @@ int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length)
 
 	if (hidden_length > length - 8)
 	{
-		log(1, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
+		LOG(1, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
 		return 0;
 	}
 
@@ -4111,3 +4614,118 @@ int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length)
 	return hidden_length + 6;
 }
 
+static int ip_filter_port(ip_filter_portt *p, uint16_t port)
+{
+	switch (p->op)
+	{
+	case FILTER_PORT_OP_EQ:    return port == p->port;
+	case FILTER_PORT_OP_NEQ:   return port != p->port;
+	case FILTER_PORT_OP_GT:    return port > p->port;
+	case FILTER_PORT_OP_LT:    return port < p->port;
+	case FILTER_PORT_OP_RANGE: return port >= p->port && port <= p->port2;
+	}
+
+	return 0;
+}
+
+static int ip_filter_flag(uint8_t op, uint8_t sflags, uint8_t cflags, uint8_t flags)
+{
+	switch (op)
+	{
+	case FILTER_FLAG_OP_ANY:
+		return (flags & sflags) || (~flags & cflags);
+
+	case FILTER_FLAG_OP_ALL:
+		return (flags & sflags) == sflags && (~flags & cflags) == cflags;
+
+	case FILTER_FLAG_OP_EST:
+		return (flags & (TCP_FLAG_ACK|TCP_FLAG_RST)) && (~flags & TCP_FLAG_SYN);
+	}
+
+	return 0;
+}
+
+int ip_filter(uint8_t *buf, int len, uint8_t filter)
+{
+	uint16_t frag_offset;
+	uint8_t proto;
+    	in_addr_t src_ip;
+	in_addr_t dst_ip;
+	uint16_t src_port = 0;
+	uint16_t dst_port = 0;
+	uint8_t flags = 0;
+	ip_filter_rulet *rule;
+
+    	if (len < 20) // up to end of destination address
+		return 0;
+
+	if ((*buf >> 4) != 4) // IPv4
+		return 0;
+
+	frag_offset = ntohs(*(uint16_t *) (buf + 6)) & 0x1fff;
+	proto = buf[9];
+	src_ip = *(in_addr_t *) (buf + 12);
+	dst_ip = *(in_addr_t *) (buf + 16);
+
+	if (frag_offset == 0 && (proto == IPPROTO_TCP || proto == IPPROTO_UDP))
+	{
+		int l = (buf[0] & 0xf) * 4; // length of IP header
+		if (len < l + 4) // ports
+			return 0;
+
+		src_port = ntohs(*(uint16_t *) (buf + l));
+		dst_port = ntohs(*(uint16_t *) (buf + l + 2));
+		if (proto == IPPROTO_TCP)
+		{
+		    	if (len < l + 14) // flags
+				return 0;
+
+			flags = buf[l + 13] & 0x3f;
+		}
+	}
+
+	for (rule = ip_filters[filter].rules; rule->action; rule++)
+	{
+		if (rule->proto != IPPROTO_IP && proto != rule->proto)
+			continue;
+
+		if (rule->src_wild != INADDR_BROADCAST &&
+		    (src_ip & ~rule->src_wild) != (rule->src_ip & ~rule->src_wild))
+			continue;
+
+		if (rule->dst_wild != INADDR_BROADCAST &&
+		    (dst_ip & ~rule->dst_wild) != (rule->dst_ip & ~rule->dst_wild))
+			continue;
+
+		if (frag_offset)
+		{
+			if (!rule->frag || rule->action == FILTER_ACTION_DENY)
+				continue;
+		}
+		else
+		{
+			if (rule->frag)
+				continue;
+
+			if (proto == IPPROTO_TCP || proto == IPPROTO_UDP)
+			{
+				if (rule->src_ports.op && !ip_filter_port(&rule->src_ports, src_port))
+					continue;
+
+				if (rule->dst_ports.op && !ip_filter_port(&rule->dst_ports, dst_port))
+					continue;
+
+				if (proto == IPPROTO_TCP && rule->tcp_flag_op &&
+				    !ip_filter_flag(rule->tcp_flag_op, rule->tcp_sflags, rule->tcp_cflags, flags))
+					continue;
+			}
+		}
+
+		// matched
+		rule->counter++;
+		return rule->action == FILTER_ACTION_PERMIT;
+	}
+
+	// default deny
+    	return 0;
+}