X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/90f31e7f7188cd1a6ce58c4cc7d31bf7005a239c..e81de14faf3f9bd59e357eb2a9f5ff48cc3df00c:/l2tpns.c?ds=inline

diff --git a/l2tpns.c b/l2tpns.c
index c0e7b7a..de3929d 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.39 2004/11/03 13:23:58 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.56 2004/11/25 02:49:18 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -23,6 +23,7 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.39 2004/11/03 13:23:58 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,46 +49,44 @@ char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.39 2004/11/03 13:23:58 bodea Exp
 #include "util.h"
 #include "tbf.h"
 
+#ifdef BGP
+#include "bgp.h"
+#endif /* BGP */
+
 // Globals
 struct configt *config = NULL;	// all configuration
 int tunfd = -1;			// tun interface file handle. (network device)
 int udpfd = -1;			// UDP file handle
 int controlfd = -1;		// Control signal handle
+int clifd = -1;			// Socket listening for CLI connections.
 int snoopfd = -1;		// UDP file handle for sending out intercept data
 int *radfds = NULL;		// RADIUS requests file handles
 int ifrfd = -1;			// File descriptor for routing, etc
 time_t basetime = 0;		// base clock
 char hostname[1000] = "";	// us.
-int tunidx;			// ifr_ifindex of tun device
-u32 sessionid = 0;		// session id for radius accounting
-int syslog_log = 0;		// are we logging to syslog
-FILE *log_stream = NULL;	// file handle for direct logging (i.e. direct into file, not via syslog).
+static u32 sessionid = 0;	// session id for radius accounting
+static int syslog_log = 0;	// are we logging to syslog
+static FILE *log_stream = NULL;	// file handle for direct logging (i.e. direct into file, not via syslog).
 extern int cluster_sockfd;	// Intra-cluster communications socket.
 u32 last_id = 0;		// Last used PPP SID. Can I kill this?? -- mo
-int clifd = 0;			// Socket listening for CLI connections.
 
 struct cli_session_actions *cli_session_actions = NULL;	// Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;	// Pending tunnel changes required by CLI
 
 static void *ip_hash[256];	// Mapping from IP address to session structures.
 
-u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;	// Global traffic counters.
-u32 eth_tx = 0, eth_rx = 0, eth_rx_pkt = 0;
-u32 ip_pool_size = 1;		// Size of the pool of addresses used for dynamic address allocation.
-time_t time_now = 0;		// Current time in seconds since epoch.
-char time_now_string[64] = {0};	// Current time as a string.
-char main_quit = 0;		// True if we're in the process of exiting.
-char *_program_name = NULL;
+// Traffic counters.
+static u32 udp_rx = 0, udp_rx_pkt = 0, udp_tx = 0;
+static u32 eth_rx = 0, eth_rx_pkt = 0;
+u32 eth_tx = 0;
+
+static u32 ip_pool_size = 1;		// Size of the pool of addresses used for dynamic address allocation.
+time_t time_now = 0;			// Current time in seconds since epoch.
+static char time_now_string[64] = {0};	// Current time as a string.
+static char main_quit = 0;		// True if we're in the process of exiting.
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 
-#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 }
 
@@ -106,6 +105,7 @@ struct config_descriptt config_values[] = {
 	CONFIG("radius_accounting", radius_accounting, BOOL),
 	CONFIG("radius_secret", radiussecret, STRING),
 	CONFIG("bind_address", bind_address, IP),
+	CONFIG("peer_address", peer_address, IP),
 	CONFIG("send_garp", send_garp, BOOL),
 	CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
 	CONFIG("throttle_buckets", num_tbfs, INT),
@@ -121,17 +121,10 @@ struct config_descriptt config_values[] = {
 	CONFIG("cluster_interface", cluster_interface, STRING),
 	CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
 	CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
-#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",
@@ -153,30 +146,36 @@ sessiont *session = NULL;		// Array of session structures.
 sessioncountt *sess_count = NULL;	// Array of partial per-session traffic counters.
 radiust *radius = NULL;			// Array of radius structures.
 ippoolt *ip_address_pool = NULL;	// Array of dynamic IP addresses.
-controlt *controlfree = 0;
+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 free_ip_address(sessionidt s);
+static void dump_acct_info(void);
+static void sighup_handler(int sig);
+static void sigalrm_handler(int sig);
+static void sigterm_handler(int sig);
+static void sigquit_handler(int sig);
+static void sigchild_handler(int sig);
+static void read_state(void);
+static void dump_state(void);
+static void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response);
+static void update_config(void);
+static void read_config_file(void);
+static void initplugins(void);
+static int add_plugin(char *plugin_name);
+static int remove_plugin(char *plugin_name);
+static void plugins_done(void);
+static void processcontrol(u8 * buf, int len, struct sockaddr_in *addr, int alen);
+static tunnelidt new_tunnel(void);
+static int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length);
 
 // return internal time (10ths since process startup)
-clockt now(void)
+static clockt now(void)
 {
 	struct timeval t;
 	gettimeofday(&t, 0);
@@ -194,7 +193,7 @@ clockt backoff(u8 try)
 
 
 //
-// Log a debug message.
+// Log a debug message.  Typically called vias LOG macro
 //
 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {
@@ -246,7 +245,7 @@ void _log_hex(int level, const char *title, const char *data, int maxsize)
 
 	if (config->debug < level) return;
 
-	// No support for log_hex to syslog
+	// No support for _log_hex to syslog
 	if (log_stream)
 	{
 		_log(level, 0, 0, 0, "%s (%d bytes):\n", title, maxsize);
@@ -294,12 +293,12 @@ void _log_hex(int level, const char *title, const char *data, int maxsize)
 // 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, ipt ip, ipt mask, ipt gw, u8 add)
 {
 	struct rtentry r;
 	int i;
@@ -322,14 +321,14 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 	else if (mask == 0xffffffff)
 		r.rt_flags |= RTF_HOST;
 
-	log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
+	LOG(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
 	    add ? "add" : "del",
 	    ip   >> 24, ip   >> 16 & 0xff, ip   >> 8 & 0xff, ip   & 0xff,
 	    mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
 	    gw   >> 24, gw   >> 16 & 0xff, gw   >> 8 & 0xff, gw   & 0xff);
 
 	if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
-		log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
 
 #ifdef BGP
 	if (add)
@@ -339,7 +338,7 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 #endif /* BGP */
 
 		// Add/Remove the IPs to the 'sessionbyip' cache.
-		// 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 +357,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 +367,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, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
 		exit(1);
 	}
 	{
@@ -377,7 +376,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, 0, "Can't set tun interface: %s\n", strerror(errno));
 		exit(1);
 	}
 	assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
@@ -390,32 +389,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, 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, 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, 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 +426,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, 0, "Error in UDP bind: %s\n", strerror(errno));
 		exit(1);
 	}
 	snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -441,12 +434,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, 0, "Error in control bind: %s\n", strerror(errno));
 		exit(1);
 	}
 }
@@ -466,7 +459,7 @@ void initudp(void)
 // IP address.
 //
 
-int lookup_ipmap(ipt ip)
+static int lookup_ipmap(ipt ip)
 {
 	u8 *a = (u8 *)&ip;
 	char **d = (char **) ip_hash;
@@ -517,9 +510,9 @@ static void cache_ipmap(ipt ip, int s)
 	d[(size_t) a[3]] = (char *)((int)s);
 
 	if (s > 0)
-		log(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
+		LOG(4, ip, s, session[s].tunnel, "Caching ip address %s\n", inet_toa(nip));
 	else if (s == 0)
-		log(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
+		LOG(4, ip, 0, 0, "Un-caching ip address %s\n", inet_toa(nip));
 	// else a map to an ip pool index.
 }
 
@@ -604,21 +597,21 @@ void send_garp(ipt ip)
 	s = socket(PF_INET, SOCK_DGRAM, 0);
 	if (s < 0)
 	{
-		log(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error creating socket for GARP: %s\n", strerror(errno));
 		return;
 	}
 	memset(&ifr, 0, sizeof(ifr));
 	strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
 	if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));
 		close(s);
 		return;
 	}
 	memcpy(mac, &ifr.ifr_hwaddr.sa_data, 6*sizeof(char));
 	if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error getting eth0 interface index for GARP: %s\n", strerror(errno));
 		close(s);
 		return;
 	}
@@ -627,13 +620,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;
@@ -650,7 +643,7 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 	if (!t)
 	{
 		static int backtrace_count = 0;
-		log(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
+		LOG(0, 0, 0, t, "tunnelsend called with 0 as tunnel id\n");
 		STAT(tunnel_tx_errors);
 		log_backtrace(backtrace_count, 5)
 		return;
@@ -659,11 +652,12 @@ 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, 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);
@@ -680,19 +674,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, tunnel[t].ip, 0, t, "Control message resend try %d\n", tunnel[t].try);
 		}
 	}
 
 	if (sendto(udpfd, buf, l, 0, (void *) &addr, sizeof(addr)) < 0)
 	{
-		log(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
+		LOG(0, tunnel[t].ip, ntohs((*(u16 *) (buf + 6))), t, "Error sending data out tunnel: %s (udpfd=%d, buf=%p, len=%d, dest=%s)\n",
 				strerror(errno), udpfd, buf, l, inet_ntoa(addr.sin_addr));
 		STAT(tunnel_tx_errors);
 		return;
 	}
 
-	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);
 }
@@ -708,7 +702,7 @@ int tun_write(u8 * data, int size)
 
 // process outgoing (to tunnel) IP
 //
-void processipout(u8 * buf, int len)
+static void processipout(u8 * buf, int len)
 {
 	sessionidt s;
 	sessiont *sp;
@@ -724,13 +718,13 @@ void processipout(u8 * buf, int len)
 
 	if (len < MIN_IP_SIZE)
 	{
-		log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
+		LOG(1, 0, 0, 0, "Short IP, %d bytes\n", len);
 		STAT(tunnel_tx_errors);
 		return;
 	}
 	if (len >= MAXETHER)
 	{
-		log(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
+		LOG(1, 0, 0, 0, "Oversize IP packet %d bytes\n", len);
 		STAT(tunnel_tx_errors);
 		return;
 	}
@@ -742,7 +736,7 @@ void processipout(u8 * buf, int len)
 	// Got an IP header now
 	if (*(u8 *)(buf) >> 4 != 4)
 	{
-		log(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
+		LOG(1, 0, 0, 0, "IP: Don't understand anything except IPv4\n");
 		return;
 	}
 
@@ -761,7 +755,7 @@ 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)));
+			LOG(4, 0, 0, 0, "IP: Sending ICMP host unreachable to %s\n", inet_toa(*(u32 *)(buf + 12)));
 			host_unreachable(*(u32 *)(buf + 12), *(u16 *)(buf + 4), ip, buf, (len < 64) ? 64 : len);
 		}
 		return;
@@ -785,23 +779,19 @@ 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, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
 	// Add on L2TP header
 	{
 		u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
-		if (!p)
-		{
-			log(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
-			return;
-		}
+		if (!p) return;
 		tunnelsend(b, len + (p-b), t); // send it...
 	}
 
+	// 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++;
@@ -813,7 +803,7 @@ void processipout(u8 * buf, int len)
 // Helper routine for the TBF filters.
 // Used to send queued data in to the user!
 //
-void send_ipout(sessionidt s, u8 *buf, int len)
+static void send_ipout(sessionidt s, u8 *buf, int len)
 {
 	sessiont *sp;
 	tunnelidt t;
@@ -823,7 +813,7 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
 	if (len < 0 || len > MAXETHER)
 	{
-		log(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
+		LOG(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
 		return;
 	}
 
@@ -835,25 +825,23 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
 	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, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
 	// Add on L2TP header
 	{
 		u8 *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
-		if (!p)
-		{
-			log(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
-			return;
-		}
+		if (!p) return;
 		tunnelsend(b, len + (p-b), t); // send it...
 	}
+
+	// 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++;
@@ -862,7 +850,7 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 }
 
 // add an AVP (16 bit)
-void control16(controlt * c, u16 avp, u16 val, u8 m)
+static void control16(controlt * c, u16 avp, u16 val, u8 m)
 {
 	u16 l = (m ? 0x8008 : 0x0008);
 	*(u16 *) (c->buf + c->length + 0) = htons(l);
@@ -873,7 +861,7 @@ void control16(controlt * c, u16 avp, u16 val, u8 m)
 }
 
 // add an AVP (32 bit)
-void control32(controlt * c, u16 avp, u32 val, u8 m)
+static void control32(controlt * c, u16 avp, u32 val, u8 m)
 {
 	u16 l = (m ? 0x800A : 0x000A);
 	*(u16 *) (c->buf + c->length + 0) = htons(l);
@@ -884,7 +872,7 @@ void control32(controlt * c, u16 avp, u32 val, u8 m)
 }
 
 // add an AVP (32 bit)
-void controls(controlt * c, u16 avp, char *val, u8 m)
+static void controls(controlt * c, u16 avp, char *val, u8 m)
 {
 	u16 l = ((m ? 0x8000 : 0) + strlen(val) + 6);
 	*(u16 *) (c->buf + c->length + 0) = htons(l);
@@ -895,7 +883,7 @@ void controls(controlt * c, u16 avp, char *val, u8 m)
 }
 
 // add a binary AVP
-void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
+static void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
 {
 	u16 l = ((m ? 0x8000 : 0) + len + 6);
 	*(u16 *) (c->buf + c->length + 0) = htons(l);
@@ -906,7 +894,7 @@ void controlb(controlt * c, u16 avp, char *val, unsigned int len, u8 m)
 }
 
 // new control connection
-controlt *controlnew(u16 mtype)
+static controlt *controlnew(u16 mtype)
 {
 	controlt *c;
 	if (!controlfree)
@@ -926,7 +914,7 @@ 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];
 	if (tunnel[t].controlc)	// Messages queued; They will carry the ack.
@@ -942,7 +930,7 @@ void controlnull(tunnelidt 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
@@ -1014,7 +1002,6 @@ void throttle_session(sessionidt s, int rate_in, int rate_out)
 // start tidy shutdown of session
 void sessionshutdown(sessionidt s, char *reason)
 {
-	int dead = session[s].die;
 	int walled_garden = session[s].walled_garden;
 
 
@@ -1022,29 +1009,26 @@ void sessionshutdown(sessionidt s, char *reason)
 
 	if (!session[s].tunnel)
 	{
-		log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
+		LOG(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
 		return;                   // not a live session
 	}
 
-	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, 0, 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;
 		if (!r)
 		{
 			if (!(r = radiusnew(s)))
 			{
-				log(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
+				LOG(1, 0, s, session[s].tunnel, "No free RADIUS sessions for Stop message\n");
 				STAT(radius_overflow);
 			}
 			else
@@ -1061,15 +1045,20 @@ void sessionshutdown(sessionidt s, char *reason)
 	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
@@ -1086,6 +1075,9 @@ void sessionshutdown(sessionidt s, char *reason)
 		controladd(c, session[s].tunnel, s); // send the message
 	}
 
+	if (!session[s].die)
+		session[s].die = now() + 150; // Clean up in 15 seconds
+
 	cluster_send_session(s);
 }
 
@@ -1115,24 +1107,23 @@ 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);
 	q[4] = 3;
 	q[5] = 6;
-	*(u32 *) (q + 6) = config->bind_address ? config->bind_address : my_address; // send my IP
+	*(u32 *) (q + 6) = config->peer_address ? config->peer_address :
+	    		   config->bind_address ? config->bind_address :
+			   my_address; // send my IP
+
 	tunnelsend(buf, 10 + (q - buf), t); // send it
 	session[s].flags &= ~SF_IPCP_ACKED;	// Clear flag.
 }
 
 // kill a session now
-void sessionkill(sessionidt s, char *reason)
+static void sessionkill(sessionidt s, char *reason)
 {
 
 	CSTAT(call_sessionkill);
@@ -1142,7 +1133,7 @@ void sessionkill(sessionidt s, char *reason)
 	if (session[s].radius)
 		radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
 
-	log(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
+	LOG(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
 
 	memset(&session[s], 0, sizeof(session[s]));
 	session[s].tunnel = T_FREE;	// Mark it as free.
@@ -1152,8 +1143,15 @@ 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;
@@ -1178,13 +1176,13 @@ 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, 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;
 
@@ -1196,12 +1194,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, 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
@@ -1227,18 +1225,18 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 
 	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, ntohl(addr->sin_addr.s_addr), 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, ntohl(addr->sin_addr.s_addr), 0, 0, "Bad L2TP ver %d\n", (buf[1] & 0x0F) != 2);
 		STAT(tunnel_rx_errors);
 		return;
 	}
@@ -1253,13 +1251,13 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 	p += 2;
 	if (s >= MAXSESSION)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
+		LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid session ID\n");
 		STAT(tunnel_rx_errors);
 		return;
 	}
 	if (t >= MAXTUNNEL)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
+		LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Received UDP packet with invalid tunnel ID\n");
 		STAT(tunnel_rx_errors);
 		return;
 	}
@@ -1277,7 +1275,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 	}
 	if ((p - buf) > l)
 	{
-		log(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
+		LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Bad length %d>%d\n", (p - buf), l);
 		STAT(tunnel_rx_errors);
 		return;
 	}
@@ -1304,11 +1302,11 @@ 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, ntohl(addr->sin_addr.s_addr), 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",
+		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)
@@ -1333,7 +1331,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		{
 			if (!(t = new_tunnel()))
 			{
-				log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
+				LOG(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
 				STAT(tunnel_overflow);
 				return;
 			}
@@ -1341,7 +1339,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			tunnel[t].ip = ntohl(*(ipt *) & addr->sin_addr);
 			tunnel[t].port = ntohs(addr->sin_port);
 			tunnel[t].window = 4; // default window
-			log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
+			LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, "   New tunnel from %u.%u.%u.%u/%u ID %d\n", tunnel[t].ip >> 24, tunnel[t].ip >> 16 & 255, tunnel[t].ip >> 8 & 255, tunnel[t].ip & 255, tunnel[t].port, t);
 			STAT(tunnel_created);
 		}
 
@@ -1372,7 +1370,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			if (ns != tunnel[t].nr)
 			{
 				// is this the sequence we were expecting?
-				log(1, ntohl(addr->sin_addr.s_addr), 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
+				LOG(1, ntohl(addr->sin_addr.s_addr), 0, t, "   Out of sequence tunnel %d, (%d is not the expected %d)\n", t, ns, tunnel[t].nr);
 				STAT(tunnel_rx_errors);
 
 				if (l)	// Is this not a ZLB?
@@ -1415,7 +1413,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				p += n;       // next
 				if (l < n)
 				{
-					log(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
+					LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Invalid length in AVP\n");
 					STAT(tunnel_rx_errors);
 					fatal = flags;
 					return;
@@ -1426,17 +1424,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, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no L2TP secret.\n");
 						fatal = flags;
 						continue;
 					}
 					if (!session[s].random_vector_length)
 					{
-						log(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
+						LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP requested, but no random vector.\n");
 						fatal = flags;
 						continue;
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
 					// Unhide the AVP
 					n = unhide_avp(b, t, s, n);
 					if (n == 0)
@@ -1447,14 +1445,14 @@ 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, ntohl(addr->sin_addr.s_addr), s, t, "Unrecognised AVP flags %02X\n", *b);
 					fatal = flags;
 					continue; // next
 				}
 				b += 2;
 				if (*(u16 *) (b))
 				{
-					log(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
+					LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "Unknown AVP vendor %d\n", ntohs(*(u16 *) (b)));
 					fatal = flags;
 					continue; // next
 				}
@@ -1463,12 +1461,12 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				b += 2;
 				n -= 6;
 
-				log(4, ntohl(addr->sin_addr.s_addr), s, t, "   AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
+				LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   AVP %d (%s) len %d\n", mtype, avpnames[mtype], n);
 				switch (mtype)
 				{
 				case 0:     // message type
 					message = ntohs(*(u16 *) b);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Message type = %d (%s)\n", *b,
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Message type = %d (%s)\n", *b,
 							l2tp_message_types[message]);
 					mandatorymessage = flags;
 					break;
@@ -1487,7 +1485,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 								resdesc = cdn_result_codes[rescode];
 						}
 
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",
 							rescode, resdesc);
 						if (n >= 4)
 						{
@@ -1495,11 +1493,11 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 							const char* errdesc = "(unknown)";
 							if (errcode <= MAX_ERROR_CODE)
 								errdesc = error_codes[errcode];
-							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",
+							LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",
 								errcode, errdesc);
 						}
 						if (n > 4)
-							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %.*s\n",
+							LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %.*s\n",
 								n-4, b+4);
 
 						break;
@@ -1508,10 +1506,10 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				case 2:     // protocol version
 					{
 						version = ntohs(*(u16 *) (b));
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Protocol version = %d\n", version);
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Protocol version = %d\n", version);
 						if (version && version != 0x0100)
 						{   // allow 0.0 and 1.0
-							log(1, ntohl(addr->sin_addr.s_addr), s, t, "   Bad protocol version %04X\n",
+							LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "   Bad protocol version %04X\n",
 									version);
 							fatal = flags;
 							continue; // next
@@ -1519,74 +1517,74 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					}
 					break;
 				case 3:     // framing capabilities
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
+//					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Framing capabilities\n");
 					break;
 				case 4:     // bearer capabilities
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
+//					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Bearer capabilities\n");
 					break;
 				case 5:		// tie breaker
 					// We never open tunnels, so we don't care about tie breakers
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
+//					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Tie breaker\n");
 					continue;
 				case 6:     // firmware revision
-//					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
+//					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "Firmware revision\n");
 					break;
 				case 7:     // host name
 					memset(tunnel[t].hostname, 0, 128);
 					memcpy(tunnel[t].hostname, b, (n >= 127) ? 127 : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Tunnel hostname = \"%s\"\n", tunnel[t].hostname);
 					// TBA - to send to RADIUS
 					break;
 				case 8:     // vendor name
 					memset(tunnel[t].vendor, 0, sizeof(tunnel[t].vendor));
 					memcpy(tunnel[t].vendor, b, (n >= sizeof(tunnel[t].vendor) - 1) ? sizeof(tunnel[t].vendor) - 1 : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
 					break;
 				case 9:     // assigned tunnel
 					tunnel[t].far = ntohs(*(u16 *) (b));
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Remote tunnel id = %d\n", tunnel[t].far);
 					break;
 				case 10:    // rx window
 					tunnel[t].window = ntohs(*(u16 *) (b));
 					if (!tunnel[t].window)
 						tunnel[t].window = 1; // window of 0 is silly
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   rx window = %d\n", tunnel[t].window);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   rx window = %d\n", tunnel[t].window);
 					break;
 				case 11:	// Challenge
 					{
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   LAC requested CHAP authentication for tunnel\n");
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   LAC requested CHAP authentication for tunnel\n");
 						build_chap_response(b, 2, n, &chapresponse);
 					}
 					break;
 				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");
+					LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "   received unexpected challenge response\n");
 					break;
 
 				case 14:    // assigned session
 					asession = session[s].far = ntohs(*(u16 *) (b));
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);
 					break;
 				case 15:    // call serial number
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   call serial number = %d\n", ntohl(*(u32 *)b));
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   call serial number = %d\n", ntohl(*(u32 *)b));
 					break;
 				case 18:    // bearer type
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   bearer type = %d\n", ntohl(*(u32 *)b));
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   bearer type = %d\n", ntohl(*(u32 *)b));
 					// TBA - for RADIUS
 					break;
 				case 19:    // framing type
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   framing type = %d\n", ntohl(*(u32 *)b));
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   framing type = %d\n", ntohl(*(u32 *)b));
 					// TBA
 					break;
 				case 21:    // called number
 					memset(called, 0, MAXTEL);
 					memcpy(called, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Called <%s>\n", called);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Called <%s>\n", called);
 					break;
 				case 22:    // calling number
 					memset(calling, 0, MAXTEL);
 					memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
 					break;
 				case 23:    // subtype
 					break;
@@ -1602,7 +1600,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						memcpy(tmp, b, (n >= 30) ? 30 : n);
 						session[s].tx_connect_speed = atol(tmp);
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   TX connect speed <%u>\n",
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   TX connect speed <%u>\n",
 							session[s].tx_connect_speed);
 					break;
 				case 38:    // rx connect speed
@@ -1617,19 +1615,19 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						memcpy(tmp, b, (n >= 30) ? 30 : n);
 						session[s].rx_connect_speed = atol(tmp);
 					}
-					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   RX connect speed <%u>\n",
+					LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   RX connect speed <%u>\n",
 							session[s].rx_connect_speed);
 					break;
 				case 25:    // Physical Channel ID
 					{
 						u32 tmp = ntohl(*(u32 *)b);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Physical Channel ID <%X>\n", tmp);
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Physical Channel ID <%X>\n", tmp);
 						break;
 					}
 				case 29:    // Proxy Authentication Type
 					{
 						u16 authtype = ntohs(*(u16 *)b);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Type %d (%s)\n",
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Type %d (%s)\n",
 							authtype, authtypes[authtype]);
 						requestchap = (authtype == 2);
 						break;
@@ -1638,20 +1636,20 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					{
 						char authname[64] = {0};
 						memcpy(authname, b, (n > 63) ? 63 : n);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Name (%s)\n",
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Name (%s)\n",
 							authname);
 						break;
 					}
 				case 31:    // Proxy Authentication Challenge
 					{
 						memcpy(radius[session[s].radius].auth, b, 16);
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Challenge\n");
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Challenge\n");
 						break;
 					}
 				case 32:    // Proxy Authentication ID
 					{
 						u16 authid = ntohs(*(u16 *)(b));
-						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth ID (%d)\n",
+						LOG(4, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth ID (%d)\n",
 							authid);
 						if (session[s].radius)
 							radius[session[s].radius].id = authid;
@@ -1661,56 +1659,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, ntohl(addr->sin_addr.s_addr), s, t, "   Proxy Auth Response\n");
 						break;
 					}
 				case 27:    // last send lcp
 					{        // find magic number
 						u8 *p = b, *e = p + n;
-						while (p < e && p[1])
+						while (p + 1 < e && p[1] && p + p[1] <= e)
 						{
-							if (*p == 5 && p[1] == 6)
+							if (*p == 5 && p[1] == 6) // Magic-Number
 								amagic = ntohl(*(u32 *) (p + 2));
-							else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5)
+							else if (*p == 3 && p[1] == 5 && *(u16 *) (p + 2) == htons(PPPCHAP) && p[4] == 5) // Authentication-Protocol
 								chap = 1;
-							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, ntohl(addr->sin_addr.s_addr), s, t, "   Random Vector received. Enabled AVP Hiding.\n");
 					memset(session[s].random_vector, 0, sizeof(session[s].random_vector));
 					memcpy(session[s].random_vector, b, n);
 					session[s].random_vector_length = n;
 					break;
 				default:
-					log(2, ntohl(addr->sin_addr.s_addr), s, t, "   Unknown AVP type %d\n", mtype);
+					LOG(2, ntohl(addr->sin_addr.s_addr), s, t, "   Unknown AVP type %d\n", mtype);
 					fatal = flags;
 					continue; // next
 				}
@@ -1778,7 +1760,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, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
 							sessionkill(s, "no free RADIUS sesions");
 							return;
 						}
@@ -1789,7 +1771,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						session[s].tunnel = t;
 						session[s].far = asession;
 						session[s].last_packet = time_now;
-						log(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
+						LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
 						control16(c, 14, s, 1); // assigned session
 						controladd(c, t, s); // send the reply
 						{
@@ -1811,7 +1793,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, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
 					controlnull(t); // ack
 					// In CHAP state, request PAP instead
 					if (requestchap)
@@ -1822,14 +1804,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, ntohl(addr->sin_addr.s_addr), s, t, "Missing message type\n");
 					break;
 				default:
 					STAT(tunnel_rx_errors);
 					if (mandatorymessage & 0x80)
 						tunnelshutdown(t, "Unknown message");
 					else
-						log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
+						LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown message type %d\n", message);
 					break;
 				}
 			if (chapresponse) free(chapresponse);
@@ -1837,14 +1819,14 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		else
 		{
-			log(4, 0, s, t, "   Got a ZLB ack\n");
+			LOG(4, 0, s, t, "   Got a ZLB ack\n");
 		}
 	}
 	else
 	{                          // data
 		u16 prot;
 
-		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;
@@ -1852,7 +1834,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, ntohl(addr->sin_addr.s_addr), s, t, "Short ppp length %d\n", l);
 			STAT(tunnel_rx_errors);
 			return;
 		}
@@ -1878,7 +1860,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			}
 
 
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
+			LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "UDP packet contains session %d "
 					"but no session[%d].tunnel exists (LAC said"
 					" tunnel = %d). Dropping packet.\n", s, s, t);
 			STAT(tunnel_rx_errors);
@@ -1887,7 +1869,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 
 		if (session[s].die)
 		{
-			log(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
+			LOG(3, ntohl(addr->sin_addr.s_addr), s, t, "Session %d is closing. Don't process PPP packets\n", s);
 // I'm pretty sure this isn't right -- mo.
 //			return;              // closing session, PPP not processed
 		}
@@ -1923,41 +1905,26 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		}
 		else if (prot == PPPIP)
 		{
-			if (!config->cluster_iam_master)
+			session[s].last_packet = time_now;
+			if (session[s].walled_garden && !config->cluster_iam_master)
 			{
-				// We're a slave. Should we forward this packet to the master?
-
-				// Is this a walled garden session, or something that needs it's
-				// idle time updated??
-
-				// Maintain the idle timeouts on the master. If this would
-				// significantly reset the idletimeout, run it via the master
-				// to refresh the master's idle timer.
-				// Not sure this is ideal: It may re-order packets.
-
-				if (session[s].walled_garden || (session[s].last_packet + (ECHO_TIMEOUT/2)) < time_now)
-				{
-					master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
-					session[s].last_packet = time_now;
-					return;
-				}
-				// fall through to processipin.
-			} else
-				session[s].last_packet = time_now;
+				master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
+				return;
+			}
 			processipin(t, s, p, l);
 		}
 		else
 		{
 			STAT(tunnel_rx_errors);
-			log(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
+			LOG(1, ntohl(addr->sin_addr.s_addr), s, t, "Unknown PPP protocol %04X\n", prot);
 		}
 	}
 }
 
 // read and process packet on tun
-void processtun(u8 * buf, int len)
+static void processtun(u8 * buf, int len)
 {
-	log_hex(5, "Receive TUN Data", buf, len);
+	LOG_HEX(5, "Receive TUN Data", buf, len);
 	STAT(tun_rx_packets);
 	INC_STAT(tun_rx_bytes, len);
 
@@ -1967,7 +1934,7 @@ void processtun(u8 * buf, int len)
 	eth_rx += len;
 	if (len < 22)
 	{
-		log(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
+		LOG(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
 		STAT(tun_rx_errors);
 		return;
 	}
@@ -1983,7 +1950,7 @@ 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;
@@ -1992,7 +1959,7 @@ int regular_cleanups(void)
 	static clockt next_acct = 0;
 	int a;
 
-	log(3, 0, 0, 0, "Begin regular cleanup\n");
+	LOG(3, 0, 0, 0, "Begin regular cleanup\n");
 
 	for (r = 1; r < MAXRADIUS; r++)
 	{
@@ -2038,7 +2005,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, tunnel[t].ip, 0, t, "Sending HELLO message\n");
 		}
 
 		// Check for tunnel changes requested from the CLI
@@ -2047,7 +2014,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, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
 				tunnelshutdown(t, "Requested by administrator");
 			}
 		}
@@ -2067,7 +2034,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, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
 			sendipcp(session[s].tunnel, s);
 		}
 
@@ -2094,18 +2061,14 @@ int regular_cleanups(void)
 			u8 b[MAXCONTROL] = {0};
 
 			u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
-			if (!q)
-			{
-				log(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
-				continue;
-			}
+			if (!q) continue;
 
 			*q = EchoReq;
 			*(u8 *)(q + 1) = (time_now % 255); // ID
 			*(u16 *)(q + 2) = htons(8); // Length
 			*(u32 *)(q + 4) = 0; // Magic Number (not supported)
 
-			log(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
+			LOG(4, session[s].ip, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
 					(int)(time_now - session[s].last_packet));
 			tunnelsend(b, 24, session[s].tunnel); // send it
 			if (++count >= MAX_ACTIONS) break;
@@ -2119,21 +2082,21 @@ 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, 0, s, session[s].tunnel, "Dropping session by CLI\n");
 				sessionshutdown(s, "Requested by administrator");
 				a = 0; // dead, no need to check for other actions
 			}
 
 			if (a & CLI_SESS_NOSNOOP)
 			{
-				log(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
+				LOG(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
 				session[s].snoop_ip = 0;
 				session[s].snoop_port = 0;
 				send++;
 			}
 			else if (a & CLI_SESS_SNOOP)
 			{
-				log(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+				LOG(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
 				    inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
 
 				session[s].snoop_ip = cli_session_actions[s].snoop_ip;
@@ -2143,13 +2106,13 @@ int regular_cleanups(void)
 
 			if (a & CLI_SESS_NOTHROTTLE)
 			{
-				log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
+				LOG(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
 				throttle_session(s, 0, 0);
 				send++;
 			}
 			else if (a & CLI_SESS_THROTTLE)
 			{
-				log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
+				LOG(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
 				    cli_session_actions[s].throttle_in,
 				    cli_session_actions[s].throttle_out);
 
@@ -2174,7 +2137,7 @@ int regular_cleanups(void)
 	if (count >= MAX_ACTIONS)
 		return 1;	// Didn't finish!
 
-	log(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
+	LOG(3, 0, 0, 0, "End regular cleanup (%d actions), next in %d seconds\n", count, config->cleanup_interval);
 	return 0;
 }
 
@@ -2183,7 +2146,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;
@@ -2198,7 +2161,7 @@ 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,0, "Tunnel %d still has un-acked control messages.\n", i);
 			last_talked = TIME;
 		}
 		return 1;
@@ -2207,7 +2170,7 @@ int still_busy(void)
 	// 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, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
 		return 0;
 	}
 
@@ -2220,7 +2183,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,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
 			last_talked = TIME;
 		}
 		return 1;
@@ -2233,7 +2196,7 @@ 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)
 {
 	int i;
 	u8 buf[65536];
@@ -2241,7 +2204,7 @@ void mainloop(void)
 	clockt next_cluster_ping = 0;	// send initial ping immediately
 	time_t next_clean = time_now + config->cleanup_interval;
 
-	log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
+	LOG(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
 			udpfd, tunfd, cluster_sockfd, controlfd);
 
 	FD_ZERO(&readset);
@@ -2307,7 +2270,7 @@ void mainloop(void)
 			    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, 0, "Error returned from select(): %s\n", strerror(errno));
 			main_quit++;
 			break;
 		}
@@ -2351,7 +2314,7 @@ void mainloop(void)
 			}
 
 			if (FD_ISSET(controlfd, &r))
-				processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
+				processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr, alen);
 
 			if (FD_ISSET(clifd, &r))
 			{
@@ -2361,7 +2324,7 @@ void mainloop(void)
 
 				if ((sockfd = accept(clifd, (struct sockaddr *)&addr, &len)) <= 0)
 				{
-					log(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
+					LOG(0, 0, 0, 0, "accept error: %s\n", strerror(errno));
 					continue;
 				}
 				else
@@ -2442,19 +2405,84 @@ 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, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
 		exit(1);
 	}
 	if (!(config = shared_malloc(sizeof(struct configt))))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(config, 0, sizeof(struct configt));
@@ -2466,37 +2494,37 @@ void initdata(int optdebug, char *optconfig)
 
 	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, 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, 0, "Error doing malloc for sessions: %s\n", strerror(errno));
 		exit(1);
 	}
 
 	if (!(sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing malloc for sessions_count: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error doing malloc for sessions_count: %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, 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, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));
 		exit(1);
 	}
 
 #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, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(ringbuffer, 0, sizeof(struct Tringbuffer));
@@ -2504,14 +2532,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, 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, 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);
@@ -2536,32 +2564,23 @@ 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);
 
 #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));
-		exit(1);
-	}
+ 	if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))
+ 	{
+ 		LOG(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
+ 		exit(1);
+ 	}
 #endif /* BGP */
 }
 
-void initiptables(void)
-{
-	/* Flush the tables here so that we have a clean slate */
-
-// Not needed. 'nat' is setup by garden.c
-// mangle isn't used (as throttling is done by tbf inhouse).
-}
-
-int assign_ip_address(sessionidt s)
+static int assign_ip_address(sessionidt s)
 {
 	u32 i;
 	int best = -1;
@@ -2594,7 +2613,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, 0, s, session[s].tunnel, "assign_ip_address(): out of addresses\n");
 		return 0;
 	}
 
@@ -2612,16 +2631,19 @@ int assign_ip_address(sessionidt s)
 		strncpy(ip_address_pool[best].user, u, sizeof(ip_address_pool[best].user) - 1);
 
 	STAT(ip_allocated);
-	log(4, ip_address_pool[best].address, s, session[s].tunnel,
+	LOG(4, ip_address_pool[best].address, s, session[s].tunnel,
 		"assign_ip_address(): %s ip address %d from pool\n", reuse ? "Reusing" : "Allocating", best);
 
 	return 1;
 }
 
-void free_ip_address(sessionidt s)
+static void free_ip_address(sessionidt s)
 {
 	int i = session[s].ip_pool_index;
 
+
+	CSTAT(call_free_ip_address);
+
 	if (!session[s].ip)
 		return; // what the?
 
@@ -2634,10 +2656,6 @@ void free_ip_address(sessionidt s)
 	ip_address_pool[i].assigned = 0;
 	ip_address_pool[i].session = 0;
 	ip_address_pool[i].last = time_now;
-
-
-	CSTAT(call_free_ip_address);
-
 }
 
 //
@@ -2677,7 +2695,7 @@ 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",
+			LOG(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
 				i, inet_toa(session[i].ip), ipid);
 
 			// Fall through and process it as part of the pool.
@@ -2686,7 +2704,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, 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;
@@ -2704,7 +2722,7 @@ void rebuild_address_pool(void)
 //
 // Fix the address pool to match a changed session.
 // (usually when the master sends us an update).
-void fix_address_pool(int sid)
+static void fix_address_pool(int sid)
 {
 	int ipid;
 
@@ -2725,7 +2743,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(u32 addr, u32 mask)
 {
 	int i;
 	if (mask == 0)
@@ -2746,14 +2764,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,0, "Overflowed IP pool adding %s\n", inet_toa(htonl(addr)) );
 			return;
 		}
 	}
 }
 
 // Initialize the IP address pool
-void initippool()
+static void initippool()
 {
 	FILE *f;
 	char *p;
@@ -2762,7 +2780,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, 0, "Can't load pool file " IPPOOLFILE ": %s\n", strerror(errno));
 		exit(1);
 	}
 
@@ -2781,7 +2799,7 @@ void initippool()
 			src = inet_addr(buf);
 			if (src == INADDR_NONE)
 			{
-				log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
+				LOG(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
 				exit(1);
 			}
 			// This entry is for a specific IP only
@@ -2796,18 +2814,18 @@ void initippool()
 			int numbits = 0;
 			u32 start = 0, mask = 0;
 
-			log(2, 0, 0, 0, "Adding IP address range %s\n", buf);
+			LOG(2, 0, 0, 0, "Adding IP address range %s\n", buf);
 			*p++ = 0;
 			if (!*p || !(numbits = atoi(p)))
 			{
-				log(0, 0, 0, 0, "Invalid pool range %s\n", buf);
+				LOG(0, 0, 0, 0, "Invalid pool range %s\n", buf);
 				continue;
 			}
 			start = ntohl(inet_addr(pool));
 			mask = (u32)(pow(2, numbits) - 1) << (32 - numbits);
 
 			// Add a static route for this pool
-			log(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
+			LOG(5, 0, 0, 0, "Adding route for address pool %s/%u\n", inet_toa(htonl(start)), 32 + mask);
 			routeset(0, start, mask, 0, 1);
 
 			add_to_ip_pool(start, mask);
@@ -2819,7 +2837,7 @@ void initippool()
 		}
 	}
 	fclose(f);
-	log(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
+	LOG(1, 0, 0, 0, "IP address pool is %d addresses\n", ip_pool_size - 1);
 }
 
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
@@ -2832,14 +2850,14 @@ 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",
+	LOG(5, 0, 0, 0, "Snooping packet at %p (%d bytes) to %s:%d\n",
 			packet, size, inet_toa(snoop_addr.sin_addr.s_addr), htons(snoop_addr.sin_port));
 	if (sendto(snoopfd, packet, size, MSG_DONTWAIT | MSG_NOSIGNAL, (void *) &snoop_addr, sizeof(snoop_addr)) < 0)
-		log(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Error sending intercept packet: %s\n", strerror(errno));
 	STAT(packets_snooped);
 }
 
-void dump_acct_info()
+static void dump_acct_info()
 {
 	char filename[1024];
 	char timestr[64];
@@ -2862,10 +2880,10 @@ void dump_acct_info()
 			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));
+				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);
+			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"
@@ -2876,7 +2894,7 @@ void dump_acct_info()
 			        now - basetime);
 		}
 
-		log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
+		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
@@ -2895,43 +2913,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;
 		}
 	}
 
@@ -2941,7 +2958,6 @@ int main(int argc, char *argv[])
 	signal(SIGALRM, sigalrm_handler);
 	siginterrupt(SIGALRM, 0);
 
-	initiptables();
 	initplugins();
 	initdata(optdebug, optconfig);
 
@@ -2949,16 +2965,16 @@ int main(int argc, char *argv[])
 	read_config_file();
 	init_tbf(config->num_tbfs);
 
-	log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
-	log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
-	log(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+	LOG(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
+	LOG(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
+	LOG(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
 	{
 		struct rlimit rlim;
 		rlim.rlim_cur = RLIM_INFINITY;
 		rlim.rlim_max = RLIM_INFINITY;
 		// Remove the maximum core size
 		if (setrlimit(RLIMIT_CORE, &rlim) < 0)
-			log(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
+			LOG(0, 0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
 		// Make core dumps go to /tmp
 		chdir("/tmp");
 	}
@@ -2971,42 +2987,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, 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, 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, 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, 0, "Set up on interface %s\n", config->tundevice);
 
 	initudp();
 	initrad();
@@ -3024,9 +3040,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, 0, "Locking pages into memory\n");
 		else
-			log(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
+			LOG(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
 	}
 
 	alarm(1);
@@ -3040,12 +3056,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) */
@@ -3061,7 +3074,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)
 	{
@@ -3072,7 +3085,7 @@ void sighup_handler(int junk)
 	read_config_file();
 }
 
-void sigalrm_handler(int junk)
+static void sigalrm_handler(int sig)
 {
 	// Log current traffic stats
 
@@ -3105,20 +3118,20 @@ void sigalrm_handler(int junk)
 
 }
 
-void sigterm_handler(int junk)
+static void sigterm_handler(int sig)
 {
-	log(1, 0, 0, 0, "Shutting down cleanly\n");
+	LOG(1, 0, 0, 0, "Shutting down cleanly\n");
 	if (config->save_state)
 		dump_state();
 
 	main_quit++;
 }
 
-void sigquit_handler(int junk)
+static void sigquit_handler(int sig)
 {
 	int i;
 
-	log(1, 0, 0, 0, "Shutting down without saving sessions\n");
+	LOG(1, 0, 0, 0, "Shutting down without saving sessions\n");
 	for (i = 1; i < MAXSESSION; i++)
 	{
 		if (session[i].opened)
@@ -3133,13 +3146,13 @@ void sigquit_handler(int junk)
 	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;
@@ -3162,7 +3175,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, 0, "State file is too old to read, ignoring\n");
 		unlink(STATEFILE);
 		return ;
 	}
@@ -3172,41 +3185,41 @@ void read_state()
 
 	if (!f)
 	{
-		log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
+		LOG(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
 		exit(1);
 	}
 
 	if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
 	{
-		log(0, 0, 0, 0, "Bad state file magic\n");
+		LOG(0, 0, 0, 0, "Bad state file magic\n");
 		exit(1);
 	}
 
-	log(1, 0, 0, 0, "Reading state information\n");
+	LOG(1, 0, 0, 0, "Reading state information\n");
 	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
 	{
-		log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
+		LOG(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
 		exit(1);
 	}
 
 	if (buf[0] > ip_pool_size)
 	{
-		log(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
+		LOG(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
 		exit(1);
 	}
 
-	log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
+	LOG(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
 	for (i = 0; i < buf[0]; i++)
 	{
 		if (fread(&itmp, sizeof(itmp), 1, f) != 1)
 		{
-			log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
+			LOG(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
 			exit(1);
 		}
 
 		if (itmp.address != ip_address_pool[i].address)
 		{
-			log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
+			LOG(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
 			exit(1);
 		}
 
@@ -3215,14 +3228,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, 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, 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, 0, "Error reading tunnel data from state file\n");
 		exit(1);
 	}
 
@@ -3232,19 +3245,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, 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, 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, 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, 0, "Error reading session data from state file\n");
 		exit(1);
 	}
 
@@ -3254,17 +3267,17 @@ 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, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
 			if (session[i].ip)
 				sessionsetup(session[i].tunnel, i);
 		}
 	}
 
 	fclose(f);
-	log(0, 0, 0, 0, "Loaded saved state information\n");
+	LOG(0, 0, 0, 0, "Loaded saved state information\n");
 }
 
-void dump_state()
+static void dump_state()
 {
 	FILE *f;
 	u32 buf[2];
@@ -3277,12 +3290,12 @@ void dump_state()
 		if (!(f = fopen(STATEFILE, "w")))
 			break;
 
-		log(1, 0, 0, 0, "Dumping state information\n");
+		LOG(1, 0, 0, 0, "Dumping state information\n");
 
 		if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
 			break;
 
-		log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
+		LOG(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
 		buf[0] = ip_pool_size;
 		buf[1] = sizeof(ippoolt);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3290,7 +3303,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, 0, "Dumping %u tunnels\n", MAXTUNNEL);
 		buf[0] = MAXTUNNEL;
 		buf[1] = sizeof(tunnelt);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3298,7 +3311,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, 0, "Dumping %u sessions\n", MAXSESSION);
 		buf[0] = MAXSESSION;
 		buf[1] = sizeof(sessiont);
 		if (fwrite(buf, sizeof(buf), 1, f) != 1)
@@ -3311,22 +3324,22 @@ void dump_state()
 	}
 	while (0);
 
-	log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
+	LOG(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
 	unlink(STATEFILE);
 }
 
-void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)
+static void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)
 {
 	MD5_CTX ctx;
 	*challenge_response = NULL;
 
 	if (!*config->l2tpsecret)
 	{
-		log(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
+		LOG(0, 0, 0, 0, "LNS requested CHAP authentication, but no l2tp secret is defined\n");
 		return;
 	}
 
-	log(4, 0, 0, 0, "   Building challenge response for CHAP request\n");
+	LOG(4, 0, 0, 0, "   Building challenge response for CHAP request\n");
 
 	*challenge_response = (char *)calloc(17, 1);
 
@@ -3350,7 +3363,7 @@ static int facility_value(char *name)
 	return 0;
 }
 
-void update_config()
+static void update_config()
 {
 	int i;
 	static int timeout = 0;
@@ -3417,7 +3430,7 @@ void update_config()
 
 	if (!config->numradiusservers)
 	{
-		log(0, 0, 0, 0, "No RADIUS servers defined!\n");
+		LOG(0, 0, 0, 0, "No RADIUS servers defined!\n");
 	}
 
 	config->num_radfds = 2 << RADIUS_SHIFT;
@@ -3427,6 +3440,7 @@ void update_config()
 	{
 		if (strcmp(config->plugins[i], config->old_plugins[i]) == 0)
 			continue;
+
 		if (*config->plugins[i])
 		{
 			// Plugin added
@@ -3459,7 +3473,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,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
 			config->cluster_hb_timeout = t;
 		}
 
@@ -3483,14 +3497,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, 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;
 
@@ -3501,9 +3515,9 @@ void read_config_file()
 		return;
 	}
 
-	log(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
+	LOG(3, 0, 0, 0, "Reading config file %s\n", config->config_file);
 	cli_do_file(f);
-	log(3, 0, 0, 0, "Done reading config file\n");
+	LOG(3, 0, 0, 0, "Done reading config file\n");
 	fclose(f);
 	update_config();
 }
@@ -3518,20 +3532,19 @@ int sessionsetup(tunnelidt t, sessionidt s)
 
 	CSTAT(call_sessionsetup);
 
-	log(3, session[s].ip, s, t, "Doing session setup for session\n");
+	LOG(3, session[s].ip, s, t, "Doing session setup for session\n");
 
 	if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
 	{
 		assign_ip_address(s);
-		if (session[s].ip)
-			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, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
 			sessionshutdown(s, "No IP addresses available");
 			return 0;
 		}
+		LOG(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
+			inet_toa(htonl(session[s].ip)));
 	}
 
 
@@ -3553,23 +3566,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++;
 
-	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);
+			routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 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, session[s].ip, s, t, "Sending initial IPCP to client\n");
 		sendipcp(t, s);
 		session[s].unique_id = ++last_id;
 	}
@@ -3590,7 +3615,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
 		char *sessionip, *tunnelip;
 		sessionip = strdup(inet_toa(htonl(session[s].ip)));
 		tunnelip = strdup(inet_toa(htonl(tunnel[t].ip)));
-		log(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
+		LOG(2, session[s].ip, s, t, "Login by %s at %s from %s (%s)\n",
 				session[s].user, sessionip, tunnelip, tunnel[t].hostname);
 		if (sessionip) free(sessionip);
 		if (tunnelip) free(tunnelip);
@@ -3608,12 +3633,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,0,s,0, "Strange session update received!\n");
 			// FIXME! What to do here?
 		return 0;
 	}
@@ -3625,48 +3651,66 @@ 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++)
-	{
-		if (new->route[i].ip == session[s].route[i].ip &&
-		    new->route[i].mask == session[s].route[i].mask)
-			continue;
-
-		if (session[s].route[i].ip) // Remove the old one if it exists.
-			routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
-
-		if (new->route[i].ip)	// Add the new one if it exists.
-			routeset(s, new->route[i].ip, new->route[i].mask, new->ip, 1);
-	}
-
 	if (new->tunnel && s > config->cluster_highest_sessionid)	// Maintain this in the slave. It's used
 					// for walking the sessions to forward byte counts to the master.
 		config->cluster_highest_sessionid = s;
@@ -3686,22 +3730,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;
 
@@ -3716,11 +3745,34 @@ 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, 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, 0, "plugin requested config item \"%s\" expecting type %d, have type %d\n",
+				key, type, config_values[i].type);
+
+			return 0;
+		}
+	}
+
+	LOG(1, 0, 0, 0, "plugin requested unknown config item \"%s\"\n", key);
+	return 0;
+}
+
+static int add_plugin(char *plugin_name)
 {
 	static struct pluginfuncs funcs = {
 		_log,
@@ -3729,9 +3781,12 @@ void add_plugin(char *plugin_name)
 		sessionbyuser,
 		sessiontbysessionidt,
 		sessionidtbysessiont,
-		sessionkill,
 		radiusnew,
 		radiussend,
+		getconfig,
+		sessionkill,
+		throttle_session,
+		cluster_send_session,
 	};
 
 	void *p = open_plugin(plugin_name, 1);
@@ -3740,23 +3795,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, 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, 0, "   Plugin load failed: API version mismatch: %s\n", dlerror());
 			dlclose(p);
-			return;
+			return -1;
 		}
 	}
 
@@ -3764,9 +3819,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, 0, "   Plugin load failed: plugin_init() returned FALSE: %s\n", dlerror());
 			dlclose(p);
-			return;
+			return -1;
 		}
 	}
 
@@ -3777,12 +3832,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, 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, 0, "   Loaded plugin %s\n", plugin_name);
+	return 1;
 }
 
 static void run_plugin_done(void *plugin)
@@ -3793,48 +3849,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, 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;
 
@@ -3843,83 +3905,190 @@ void plugins_done()
 		run_plugin_done(p);
 }
 
-void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
+static void processcontrol(u8 * buf, int len, struct sockaddr_in *addr, int alen)
 {
-	char *resp;
-	int l;
-	struct param_control param = { buf, len, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), NULL, 0, 0 };
-
+	struct nsctl request;
+	struct nsctl response;
+	int type = unpack_control(&request, buf, len);
+	int r;
+	void *p;
 
 	if (log_stream && config->debug >= 4)
 	{
-		log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
-		dump_packet(buf, log_stream);
+		if (type < 0)
+		{
+			LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Bogus control message (%d)\n", type);
+		}
+		else
+		{
+			LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
+			dump_control(&request, log_stream);
+		}
 	}
 
-	resp = calloc(1400, 1);
-	l = new_packet(PKT_RESP_ERROR, resp);
-	*(int *)(resp + 6) = *(int *)(buf + 6);
+	switch (type)
+	{
+	case NSCTL_REQ_LOAD:
+		if (request.argc != 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = "name of plugin required";
+		}
+		else if ((r = add_plugin(request.argv[0])) < 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = !r
+				? "plugin already loaded"
+				: "error loading plugin";
+		}
+		else
+		{
+			response.type = NSCTL_RES_OK;
+			response.argc = 0;
+		}
 
-	param.type = ntohs(*(short *)(buf + 2));
-	param.id = ntohl(*(int *)(buf + 6));
-	param.data_length = ntohs(*(short *)(buf + 4)) - 10;
-	param.data = (param.data_length > 0) ? (char *)(buf + 10) : NULL;
-	param.response = resp;
-	param.response_length = l;
+		break;
 
-	run_plugins(PLUGIN_CONTROL, &param);
+	case NSCTL_REQ_UNLOAD:
+		if (request.argc != 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = "name of plugin required";
+		}
+		else if ((r = remove_plugin(request.argv[0])) < 1)
+		{
+			response.type = NSCTL_RES_ERR;
+			response.argc = 1;
+			response.argv[0] = !r
+				? "plugin not loaded"
+				: "plugin not found";
+		}
+		else
+		{
+			response.type = NSCTL_RES_OK;
+			response.argc = 0;
+		}
 
-	if (param.send_response)
-	{
-		send_packet(controlfd, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), param.response, param.response_length);
-		log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent Control packet response\n");
-	}
+		break;
 
-	free(resp);
-}
+	case NSCTL_REQ_HELP:
+		response.type = NSCTL_RES_OK;
+		response.argc = 0;
 
-/*
- * HACK
- * Go through all of the tunnels and do some cleanups
- */
-void tunnel_clean()
-{
-	int i;
+		ll_reset(loaded_plugins);
+		while ((p = ll_next(loaded_plugins)))
+		{
+			char **help = dlsym(p, "plugin_control_help");
+			while (response.argc < 0xff && help && *help)
+				response.argv[response.argc++] = *help++;
+		}
 
-	log(1, 0, 0, 0, "Cleaning tunnels array\n");
+		break;
 
-	for (i = 1; i < MAXTUNNEL; i++)
+	case NSCTL_REQ_CONTROL:
+		{
+			struct param_control param = {
+				config->cluster_iam_master,
+				request.argc,
+				request.argv,
+				0,
+				NULL,
+			};
+
+			int r = run_plugins(PLUGIN_CONTROL, &param);
+
+			if (r == PLUGIN_RET_ERROR)
+			{
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				response.argv[0] = param.additional
+					? param.additional
+					: "error returned by plugin";
+			}
+			else if (r == PLUGIN_RET_NOTMASTER)
+			{
+				static char msg[] = "must be run on master: 000.000.000.000";
+
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				if (config->cluster_master_address)
+				{
+					strcpy(msg + 23, inet_toa(config->cluster_master_address));
+					response.argv[0] = msg;
+				}
+				else
+				{
+				    	response.argv[0] = "must be run on master: none elected";
+				}
+			}
+			else if (!(param.response & NSCTL_RESPONSE))
+			{
+				response.type = NSCTL_RES_ERR;
+				response.argc = 1;
+				response.argv[0] = param.response
+					? "unrecognised response value from plugin"
+					: "unhandled action";
+			}
+			else
+			{
+				response.type = param.response;
+				response.argc = 0;
+				if (param.additional)
+				{
+					response.argc = 1;
+					response.argv[0] = param.additional;
+				}
+			}
+		}
+
+		break;
+
+	default:
+		response.type = NSCTL_RES_ERR;
+		response.argc = 1;
+		response.argv[0] = "error unpacking control packet";
+	}
+
+	buf = calloc(NSCTL_MAX_PKT_SZ, 1);
+	if (!buf)
+	{
+		LOG(2, ntohl(addr->sin_addr.s_addr), 0, 0, "Failed to allocate nsctl response\n");
+		return;
+	}
+
+	r = pack_control(buf, NSCTL_MAX_PKT_SZ, response.type, response.argc, response.argv);
+	if (r > 0)
 	{
-		if (!tunnel[i].ip
-				|| !*tunnel[i].hostname
-				|| (tunnel[i].state == TUNNELDIE && tunnel[i].die >= time_now))
+		sendto(controlfd, buf, r, 0, (const struct sockaddr *) addr, alen);
+		if (log_stream && config->debug >= 4)
 		{
-			tunnelclear(i);
+			LOG(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Sent ");
+			dump_control(&response, log_stream);
 		}
 	}
-}
+	else
+		LOG(2, ntohl(addr->sin_addr.s_addr), 0, 0, "Failed to pack nsctl response (%d)\n", r);
 
-void tunnelclear(tunnelidt t)
-{
-	if (!t) return;
-	memset(&tunnel[t], 0, sizeof(tunnel[t]));
-	tunnel[t].state = TUNNELFREE;
+	free(buf);
 }
 
-tunnelidt new_tunnel()
+static tunnelidt new_tunnel()
 {
 	tunnelidt i;
 	for (i = 1; i < MAXTUNNEL; i++)
 	{
 		if (tunnel[i].state == TUNNELFREE)
 		{
-			log(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
+			LOG(4, 0, 0, i, "Assigning tunnel ID %d\n", i);
 			if (i > config->cluster_highest_tunnelid)
 				config->cluster_highest_tunnelid = i;
 			return i;
 		}
 	}
-	log(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
+	LOG(0, 0, 0, 0, "Can't find a free tunnel! There shouldn't be this many in use!\n");
 	return 0;
 }
 
@@ -3953,7 +4122,6 @@ void become_master(void)
 	// add radius fds
 	for (i = 0; i < config->num_radfds; i++)
 	{
-		if (!radfds[i]) continue;
 		FD_SET(radfds[i], &readset);
 		if (radfds[i] > readset_n)
 			readset_n = radfds[i];
@@ -4047,7 +4215,7 @@ 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(u8 *avp, tunnelidt t, sessionidt s, u16 length)
 {
 	MD5_CTX ctx;
 	u8 *cursor;
@@ -4082,7 +4250,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, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
 		return 0;
 	}