X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c239d4b22829335fda98b66ce045a3f624436eeb..db0ded520aee06ef21acbc519ea078e2463a4a96:/l2tpns.c?ds=inline

diff --git a/l2tpns.c b/l2tpns.c
index ebf71ad..1bcdf1d 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -1,8 +1,11 @@
 // L2TP Network Server
 // Adrian Kennard 2002
-// (c) Copyrigth 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd)
+// Copyright (c) 2003, 2004 Optus Internet Engineering
+// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.34 2004-10-29 04:01:11 bodea Exp $";
+
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
@@ -19,7 +22,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
-#define __USE_GNU
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -48,7 +50,7 @@
 
 // Globals
 struct configt *config = NULL;	// all configuration
-int tapfd = -1;			// tap interface file handle
+int tunfd = -1;			// tun interface file handle. (network device)
 int udpfd = -1;			// UDP file handle
 int controlfd = -1;		// Control signal handle
 int snoopfd = -1;		// UDP file handle for sending out intercept data
@@ -56,24 +58,25 @@ int *radfds = NULL;		// RADIUS requests file handles
 int ifrfd = -1;			// File descriptor for routing, etc
 time_t basetime = 0;		// base clock
 char hostname[1000] = "";	// us.
-u16 tapmac[3];			// MAC of tap interface
-int tapidx;			// ifr_ifindex of tap device
+int tunidx;			// ifr_ifindex of tun device
 u32 sessionid = 0;		// session id for radius accounting
 int syslog_log = 0;		// are we logging to syslog
-FILE *log_stream = NULL;
-struct sockaddr_in snoop_addr = {0};
-extern int cluster_sockfd;
-u32 last_sid = 0;
-int clifd = 0;
-sessionidt *cli_session_kill = NULL;
-tunnelidt *cli_tunnel_kill = NULL;
-static void *ip_hash[256];
-u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;
+FILE *log_stream = NULL;	// file handle for direct logging (i.e. direct into file, not via syslog).
+extern int cluster_sockfd;	// Intra-cluster communications socket.
+u32 last_id = 0;		// Last used PPP SID. Can I kill this?? -- mo
+int clifd = 0;			// Socket listening for CLI connections.
+
+struct cli_session_actions *cli_session_actions = NULL;	// Pending session changes requested by CLI
+struct cli_tunnel_actions *cli_tunnel_actions = NULL;	// Pending tunnel changes required by CLI
+
+static void *ip_hash[256];	// Mapping from IP address to session structures.
+
+u32 udp_tx = 0, udp_rx = 0, udp_rx_pkt = 0;	// Global traffic counters.
 u32 eth_tx = 0, eth_rx = 0, eth_rx_pkt = 0;
-u32 ip_pool_size = 1;
-time_t time_now = 0;
-char time_now_string[64] = {0};
-char main_quit = 0;
+u32 ip_pool_size = 1;		// Size of the pool of addresses used for dynamic address allocation.
+time_t time_now = 0;		// Current time in seconds since epoch.
+char time_now_string[64] = {0};	// Current time as a string.
+char main_quit = 0;		// True if we're in the process of exiting.
 char *_program_name = NULL;
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
@@ -91,26 +94,33 @@ int bgp_configured = 0;
 struct config_descriptt config_values[] = {
 	CONFIG("debug", debug, INT),
 	CONFIG("log_file", log_filename, STRING),
+	CONFIG("pid_file", pid_file, STRING),
 	CONFIG("l2tp_secret", l2tpsecret, STRING),
 	CONFIG("primary_dns", default_dns1, IP),
 	CONFIG("secondary_dns", default_dns2, IP),
 	CONFIG("save_state", save_state, BOOL),
 	CONFIG("primary_radius", radiusserver[0], IP),
 	CONFIG("secondary_radius", radiusserver[1], IP),
+	CONFIG("primary_radius_port", radiusport[0], SHORT),
+	CONFIG("secondary_radius_port", radiusport[1], SHORT),
 	CONFIG("radius_accounting", radius_accounting, BOOL),
 	CONFIG("radius_secret", radiussecret, STRING),
 	CONFIG("bind_address", bind_address, IP),
 	CONFIG("send_garp", send_garp, BOOL),
 	CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
+	CONFIG("throttle_buckets", num_tbfs, INT),
 	CONFIG("accounting_dir", accounting_dir, STRING),
 	CONFIG("setuid", target_uid, INT),
 	CONFIG("dump_speed", dump_speed, BOOL),
 	CONFIG("cleanup_interval", cleanup_interval, INT),
 	CONFIG("multi_read_count", multi_read_count, INT),
 	CONFIG("scheduler_fifo", scheduler_fifo, BOOL),
+	CONFIG("lock_pages", lock_pages, BOOL),
 	CONFIG("icmp_rate", icmp_rate, INT),
 	CONFIG("cluster_address", cluster_address, IP),
 	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),
@@ -138,11 +148,11 @@ char *plugin_functions[] = {
 
 #define max_plugin_functions (sizeof(plugin_functions) / sizeof(char *))
 
-tunnelt *tunnel = NULL;		// 1000 * 45 = 45000 = 45k
-sessiont *session = NULL;	// 5000 * 213 = 1065000 = 1 Mb
-sessioncountt *sess_count = NULL;
-radiust *radius = NULL;
-ippoolt *ip_address_pool = NULL;
+tunnelt *tunnel = NULL;			// Array of tunnel structures.
+sessiont *session = NULL;		// Array of session structures.
+sessioncountt *sess_count = NULL;	// Array of partial per-session traffic counters.
+radiust *radius = NULL;			// Array of radius structures.
+ippoolt *ip_address_pool = NULL;	// Array of dynamic IP addresses.
 controlt *controlfree = 0;
 struct Tstats *_statistics = NULL;
 #ifdef RINGBUFFER
@@ -160,11 +170,12 @@ 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);
 
-// return internal time (10ths since run)
+// return internal time (10ths since process startup)
 clockt now(void)
 {
 	struct timeval t;
@@ -173,12 +184,18 @@ clockt now(void)
 }
 
 // work out a retry time based on try number
+// This is a straight bounded exponential backoff.
+// Maximum re-try time is 32 seconds. (2^5).
 clockt backoff(u8 try)
 {
 	if (try > 5) try = 5;                  // max backoff
 	return now() + 10 * (1 << try);
 }
 
+
+//
+// Log a debug message.
+//
 void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...)
 {
 	static char message[65536] = {0};
@@ -289,10 +306,10 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 
 	if (!mask) mask = 0xffffffff;
 
-	ip = ip & mask;		// Force the ip to be the first one in the route.
+	ip &= mask;		// Force the ip to be the first one in the route.
 
 	memset(&r, 0, sizeof(r));
-	r.rt_dev = config->tapdevice;
+	r.rt_dev = config->tundevice;
 	r.rt_dst.sa_family = AF_INET;
 	*(u32 *) & (((struct sockaddr_in *) &r.rt_dst)->sin_addr.s_addr) = htonl(ip);
 	r.rt_gateway.sa_family = AF_INET;
@@ -304,8 +321,6 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 		r.rt_flags |= RTF_GATEWAY;
 	else if (mask == 0xffffffff)
 		r.rt_flags |= RTF_HOST;
-	if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
-		log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
 
 	log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
 	    add ? "add" : "del",
@@ -313,6 +328,9 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 	    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));
+
 #ifdef BGP
 	if (add)
 		bgp_add_route(htonl(ip), htonl(mask));
@@ -338,31 +356,32 @@ void routeset(sessionidt s, ipt ip, ipt mask, ipt gw, u8 add)
 	}
 }
 
-// Set up TAP interface
-void inittap(void)
+//
+// Set up TUN interface
+void inittun(void)
 {
 	struct ifreq ifr;
 	struct sockaddr_in sin = {0};
 	memset(&ifr, 0, sizeof(ifr));
 	ifr.ifr_flags = IFF_TUN;
 
-	tapfd = open(TAPDEVICE, O_RDWR);
-	if (tapfd < 0)
+	tunfd = open(TUNDEVICE, O_RDWR);
+	if (tunfd < 0)
 	{                          // fatal
-		log(0, 0, 0, 0, "Can't open %s: %s\n", TAPDEVICE, strerror(errno));
+		log(0, 0, 0, 0, "Can't open %s: %s\n", TUNDEVICE, strerror(errno));
 		exit(1);
 	}
 	{
-		int flags = fcntl(tapfd, F_GETFL, 0);
-		fcntl(tapfd, F_SETFL, flags | O_NONBLOCK);
+		int flags = fcntl(tunfd, F_GETFL, 0);
+		fcntl(tunfd, F_SETFL, flags | O_NONBLOCK);
 	}
-	if (ioctl(tapfd, TUNSETIFF, (void *) &ifr) < 0)
+	if (ioctl(tunfd, TUNSETIFF, (void *) &ifr) < 0)
 	{
-		log(0, 0, 0, 0, "Can't set tap interface: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Can't set tun interface: %s\n", strerror(errno));
 		exit(1);
 	}
-	assert(strlen(ifr.ifr_name) < sizeof(config->tapdevice));
-	strncpy(config->tapdevice, ifr.ifr_name, sizeof(config->tapdevice) - 1);
+	assert(strlen(ifr.ifr_name) < sizeof(config->tundevice));
+	strncpy(config->tundevice, ifr.ifr_name, sizeof(config->tundevice) - 1);
 	ifrfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
 
 	sin.sin_family = AF_INET;
@@ -387,18 +406,12 @@ void inittap(void)
 		log(0, 0, 0, 0, "Error setting tun flags: %s\n", strerror(errno));
 		exit(1);
 	}
-	if (ioctl(ifrfd, SIOCGIFHWADDR, (void *) &ifr) < 0)
-	{
-		log(0, 0, 0, 0, "Error setting tun hardware address: %s\n", strerror(errno));
-		exit(1);
-	}
-	memcpy(&tapmac, 2 + (u8 *) & ifr.ifr_hwaddr, 6);
 	if (ioctl(ifrfd, SIOCGIFINDEX, (void *) &ifr) < 0)
 	{
 		log(0, 0, 0, 0, "Error setting tun ifindex: %s\n", strerror(errno));
 		exit(1);
 	}
-	tapidx = ifr.ifr_ifindex;
+	tunidx = ifr.ifr_ifindex;
 }
 
 // set up UDP port
@@ -412,7 +425,7 @@ void initudp(void)
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(L2TPPORT);
 	addr.sin_addr.s_addr = config->bind_address;
-	udpfd = socket(AF_INET, SOCK_DGRAM, UDP);
+	udpfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	setsockopt(udpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 	{
 		int flags = fcntl(udpfd, F_GETFL, 0);
@@ -423,8 +436,7 @@ void initudp(void)
 		log(0, 0, 0, 0, "Error in UDP bind: %s\n", strerror(errno));
 		exit(1);
 	}
-	snoopfd = socket(AF_INET, SOCK_DGRAM, UDP);
-	snoop_addr.sin_family = AF_INET;
+	snoopfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
 	// Control
 	memset(&addr, 0, sizeof(addr));
@@ -471,10 +483,8 @@ int lookup_ipmap(ipt ip)
 sessionidt sessionbyip(ipt ip)
 {
 	int s = lookup_ipmap(ip);
+	CSTAT(call_sessionbyip);
 
-#ifdef STAT_CALLS
-	STAT(call_sessionbyip);
-#endif
 	if (s > 0 && s < MAXSESSION && session[s].tunnel)
 		return s;
 	return 0;
@@ -527,20 +537,31 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 	int i, j, k, l;
 	int count = 0;
 
-        cli_print(cli, "%7s %s", "Sess#", "IP Address");
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
 
-	for (i = 0; i < 256; ++i) {
-		if (!d[i]) continue;
+	cli_print(cli, "%7s %s", "Sess#", "IP Address");
+
+	for (i = 0; i < 256; ++i)
+	{
+		if (!d[i])
+			continue;
 		e = (char**) d[i];
-		for (j = 0; j < 256; ++j) {
-			if (!e[j]) continue;
+		for (j = 0; j < 256; ++j)
+		{
+			if (!e[j])
+				continue;
 			f = (char**) e[j];
-			for (k = 0; k < 256; ++k) {
-				if (!f[k]) continue;
+			for (k = 0; k < 256; ++k)
+			{
+				if (!f[k])
+					continue;
 				g = (char**)f[k];
-				for (l = 0; l < 256; ++l) {
-					if (!g[l]) continue;
-					cli_print(cli, "%7d %d.%d.%d.%d",  (int) g[l], i, j, k, l);
+				for (l = 0; l < 256; ++l)
+				{
+					if (!g[l])
+						continue;
+					cli_print(cli, "%7d %d.%d.%d.%d", (int) g[l], i, j, k, l);
 					++count;
 				}
 			}
@@ -560,10 +581,10 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 sessionidt sessionbyuser(char *username)
 {
 	int s;
-#ifdef STAT_CALLS
-	STAT(call_sessionbyuser);
-#endif
-	for (s = 1; s < MAXSESSION ; ++s) {
+	CSTAT(call_sessionbyuser);
+
+	for (s = 1; s < MAXSESSION ; ++s)
+	{
 		if (session[s].walled_garden)
 			continue;		// Skip walled garden users.
 
@@ -619,91 +640,13 @@ sessionidt sessionidtbysessiont(sessiont *s)
 	return val;
 }
 
-// Handle ARP requests
-void processarp(u8 * buf, int len)
-{
-	ipt ip;
-	sessionidt s;
-
-#ifdef STAT_CALLS
-	STAT(call_processarp);
-#endif
-	STAT(arp_recv);
-	if (len != 46)
-	{
-		log(0, 0, 0, 0, "Unexpected length ARP %d bytes\n", len);
-		STAT(arp_errors);
-		return;
-	}
-	if (*(u16 *) (buf + 16) != htons(PKTARP))
-	{
-		log(0, 0, 0, 0, "Unexpected ARP type %04X\n", ntohs(*(u16 *) (buf + 16)));
-		STAT(arp_errors);
-		return;
-	}
-	if (*(u16 *) (buf + 18) != htons(0x0001))
-	{
-		log(0, 0, 0, 0, "Unexpected ARP hard type %04X\n", ntohs(*(u16 *) (buf + 18)));
-		STAT(arp_errors);
-		return;
-	}
-	if (*(u16 *) (buf + 20) != htons(PKTIP))
-	{
-		log(0, 0, 0, 0, "Unexpected ARP prot type %04X\n", ntohs(*(u16 *) (buf + 20)));
-		STAT(arp_errors);
-		return;
-	}
-	if (buf[22] != 6)
-	{
-		log(0, 0, 0, 0, "Unexpected ARP hard len %d\n", buf[22]);
-		STAT(arp_errors);
-		return;
-	}
-	if (buf[23] != 4)
-	{
-		log(0, 0, 0, 0, "Unexpected ARP prot len %d\n", buf[23]);
-		STAT(arp_errors);
-		return;
-	}
-	if (*(u16 *) (buf + 24) != htons(0x0001))
-	{
-		log(0, 0, 0, 0, "Unexpected ARP op %04X\n", ntohs(*(u16 *) (buf + 24)));
-		STAT(arp_errors);
-		return;
-	}
-	ip = *(u32 *) (buf + 42);
-	// look up session
-	s = sessionbyip(ip);
-	if (s)
-	{
-		log(3, ntohl(ip), s, session[s].tunnel, "ARP reply for %s\n", inet_toa(ip));
-		memcpy(buf + 4, buf + 10, 6); // set destination as source
-		*(u16 *) (buf + 10) = htons(tapmac[0]); // set source address
-		*(u16 *) (buf + 12) = htons(tapmac[1]);
-		*(u16 *) (buf + 14) = htons(tapmac[2]);
-		*(u16 *) (buf + 24) = htons(0x0002); // ARP reply
-		memcpy(buf + 26, buf + 10, 6); // sender ethernet
-		memcpy(buf + 36, buf + 4, 6); // target ethernet
-		*(u32 *) (buf + 42) = *(u32 *) (buf + 32); // target IP
-		*(u32 *) (buf + 32) = ip; // sender IP
-		write(tapfd, buf, len);
-		STAT(arp_replies);
-	}
-	else
-	{
-		log(3, ntohl(ip), 0, 0, "ARP request for unknown IP %s\n", inet_toa(ip));
-		STAT(arp_discarded);
-	}
-}
-
 // actually send a control message for a specific tunnel
 void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 {
 	struct sockaddr_in addr;
 
-#ifdef STAT_CALLS
-	STAT(call_tunnelsend);
-#endif
+	CSTAT(call_tunnelsend);
+
 	if (!t)
 	{
 		static int backtrace_count = 0;
@@ -760,7 +703,7 @@ void tunnelsend(u8 * buf, u16 l, tunnelidt t)
 //
 int tun_write(u8 * data, int size)
 {
-	return write(tapfd, data, size);
+	return write(tunfd, data, size);
 }
 
 // process outgoing (to tunnel) IP
@@ -776,9 +719,9 @@ void processipout(u8 * buf, int len)
 	int size = len;
 
 	u8 b[MAXETHER + 20];
-#ifdef STAT_CALLS
-	STAT(call_processipout);
-#endif
+
+	CSTAT(call_processipout);
+
 	if (len < MIN_IP_SIZE)
 	{
 		log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
@@ -810,7 +753,8 @@ void processipout(u8 * buf, int len)
 		static int rate = 0;	// Number of ICMP packets we've sent this second.
 		static int last = 0;	// Last time we reset the ICMP packet counter 'rate'.
 
-		if (last != time_now) {
+		if (last != time_now)
+		{
 			last = time_now;
 			rate = 0;
 		}
@@ -850,7 +794,8 @@ void processipout(u8 * buf, int len)
 	// Add on L2TP header
 	{
 		u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
-		if (!p) {
+		if (!p)
+		{
 			log(3, session[s].ip, s, t, "failed to send packet in processipout.\n");
 			return;
 		}
@@ -876,7 +821,8 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
 	u8 b[MAXETHER + 20];
 
-	if (len < 0 || len > MAXETHER) {
+	if (len < 0 || len > MAXETHER)
+	{
 		log(1,0,0,0, "Odd size IP packet: %d bytes\n", len);
 		return;
 	}
@@ -894,14 +840,15 @@ void send_ipout(sessionidt s, u8 *buf, int len)
 
 	log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
-	// Snooping this session, send it to ASIO
+	// Snooping this session.
 	if (sp->snoop_ip && sp->snoop_port)
 		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
 
 	// Add on L2TP header
 	{
 		u8 *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
-		if (!p) {
+		if (!p)
+		{
 			log(3, session[s].ip, s, t, "failed to send packet in send_ipout.\n");
 			return;
 		}
@@ -1028,11 +975,16 @@ int throttle_session(sessionidt s, int throttle)
 	if (!session[s].tunnel)
 		return 0;	// No-one home.
 
-        if (!*session[s].user)
-                return 0; // User not logged in
+	if (!*session[s].user)
+	        return 0; // User not logged in
+
+	if (throttle)
+	{
+		int rate_in = throttle & 0x0000FFFF;
+		int rate_out = throttle >> 16;
 
-	if (throttle) {
-		if (session[s].tbf_in || session[s].tbf_out) {
+		if (session[s].tbf_in || session[s].tbf_out)
+		{
 			if (throttle == session[s].throttle)
 				return 1;
 
@@ -1042,10 +994,12 @@ int throttle_session(sessionidt s, int throttle)
 			free_tbf(session[s].tbf_out);
 		}
 
-		session[s].tbf_in = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipin);
-		session[s].tbf_out = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipout);
+		if (rate_in) session[s].tbf_in = new_tbf(s, rate_in * 1024 / 4, rate_in * 1024 / 8, send_ipin);
+		if (rate_out) session[s].tbf_out = new_tbf(s, rate_out * 1024 / 4, rate_out * 1024 / 8, send_ipout);
 
-		if (throttle != session[s].throttle) {	// Changed. Flood to slaves.
+		if (throttle != session[s].throttle)
+		{
+			// Changed. Flood to slaves.
 			session[s].throttle = throttle;
 			cluster_send_session(s);
 		}
@@ -1064,7 +1018,9 @@ int throttle_session(sessionidt s, int throttle)
 	free_tbf(session[s].tbf_out);
 	session[s].tbf_out = 0;
 
-	if (throttle != session[s].throttle) {	// Changed. Flood to slaves.
+	if (throttle != session[s].throttle)
+	{
+		// Changed. Flood to slaves.
 		session[s].throttle = throttle;
 		cluster_send_session(s);
 	}
@@ -1078,16 +1034,16 @@ void sessionshutdown(sessionidt s, char *reason)
 	int dead = session[s].die;
 	int walled_garden = session[s].walled_garden;
 
-#ifdef STAT_CALLS
-	STAT(call_sessionshutdown);
-#endif
+
+	CSTAT(call_sessionshutdown);
+
 	if (!session[s].tunnel)
 	{
 		log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
 		return;                   // not a live session
 	}
 
-	if (!session[s].die)
+	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
@@ -1098,7 +1054,8 @@ void sessionshutdown(sessionidt s, char *reason)
 	}
 
 	// RADIUS Stop message
-	if (session[s].opened && !walled_garden && !dead) {
+	if (session[s].opened && !walled_garden && !dead)
+	{
 		u16 r = session[s].radius;
 		if (!r)
 		{
@@ -1152,25 +1109,29 @@ void sendipcp(tunnelidt t, sessionidt s)
 	u8 buf[MAXCONTROL];
 	u16 r = session[s].radius;
 	u8 *q;
-#ifdef STAT_CALLS
-	STAT(call_sendipcp);
-#endif
+
+	CSTAT(call_sendipcp);
+
 	if (!r)
 		r = radiusnew(s);
+
 	if (radius[r].state != RADIUSIPCP)
 	{
 		radius[r].state = RADIUSIPCP;
 		radius[r].try = 0;
 	}
+
 	radius[r].retry = backoff(radius[r].try++);
 	if (radius[r].try > 10)
 	{
+		radiusclear(r, s);	// Clear radius session.
 		sessionshutdown(s, "No reply on IPCP");
 		return;
 	}
 
 	q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
-	if (!q) {
+	if (!q)
+	{
 		log(3, session[s].ip, s, t, "failed to send packet in sendipcp.\n");
 		return;
 	}
@@ -1180,7 +1141,7 @@ void sendipcp(tunnelidt t, sessionidt s)
 	*(u16 *) (q + 2) = htons(10);
 	q[4] = 3;
 	q[5] = 6;
-	*(u32 *) (q + 6) = config->bind_address; // send my IP
+	*(u32 *) (q + 6) = 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.
 }
@@ -1188,12 +1149,14 @@ void sendipcp(tunnelidt t, sessionidt s)
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
-#ifdef STAT_CALLS
-	STAT(call_sessionkill);
-#endif
+
+	CSTAT(call_sessionkill);
+
+	session[s].die = now();
 	sessionshutdown(s, reason);  // close radius/routes, etc.
 	if (session[s].radius)
-		radiusclear(session[s].radius, 0); // cant send clean accounting data, session is killed
+		radiusclear(session[s].radius, s); // cant send clean accounting data, session is killed
+
 	log(2, 0, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
 
 	throttle_session(s, 0);		// Force session to be un-throttle. Free'ing TBF structures.
@@ -1202,6 +1165,7 @@ void sessionkill(sessionidt s, char *reason)
 	session[s].tunnel = T_FREE;	// Mark it as free.
 	session[s].next = sessionfree;
 	sessionfree = s;
+	cli_session_actions[s].action = 0;
 	cluster_send_session(s);
 }
 
@@ -1210,9 +1174,8 @@ void tunnelkill(tunnelidt t, char *reason)
 {
 	sessionidt s;
 	controlt *c;
-#ifdef STAT_CALLS
-	STAT(call_tunnelkill);
-#endif
+
+	CSTAT(call_tunnelkill);
 
 	tunnel[t].state = TUNNELDIE;
 
@@ -1232,19 +1195,18 @@ void tunnelkill(tunnelidt t, char *reason)
 
 	// free tunnel
 	tunnelclear(t);
-	cluster_send_tunnel(t);
 	log(1, 0, 0, t, "Kill tunnel %d: %s\n", t, reason);
-	tunnel[t].die = 0;
-	tunnel[t].state = TUNNELFREE;
+	cli_tunnel_actions[s].action = 0;
+	cluster_send_tunnel(t);
 }
 
 // shut down a tunnel cleanly
 void tunnelshutdown(tunnelidt t, char *reason)
 {
 	sessionidt s;
-#ifdef STAT_CALLS
-	STAT(call_tunnelshutdown);
-#endif
+
+	CSTAT(call_tunnelshutdown);
+
 	if (!tunnel[t].last || !tunnel[t].far || tunnel[t].state == TUNNELFREE)
 	{
 		// never set up, can immediately kill
@@ -1277,9 +1239,9 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 	u16 l = len, t = 0, s = 0, ns = 0, nr = 0;
 	u8 *p = buf + 2;
 
-#ifdef STAT_CALLS
-	STAT(call_processudp);
-#endif
+
+	CSTAT(call_processudp);
+
 	udp_rx += len;
 	udp_rx_pkt++;
 	log_hex(5, "UDP Data", buf, len);
@@ -1351,7 +1313,8 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 		char called[MAXTEL] = ""; // called number
 		char calling[MAXTEL] = ""; // calling number
 
-		if (!config->cluster_iam_master) {
+		if (!config->cluster_iam_master)
+		{
 			master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port);
 			return;
 		}
@@ -1372,17 +1335,19 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 				//
 				// Is this a duplicate of the first packet? (SCCRQ)
 				//
-			for ( i = 1; i <= config->cluster_highest_tunnelid ; ++i) {
-				if (tunnel[t].state != TUNNELOPENING ||
-					tunnel[t].ip != ntohl(*(ipt *) & addr->sin_addr) ||
-					tunnel[t].port != ntohs(addr->sin_port) )
+			for (i = 1; i <= config->cluster_highest_tunnelid ; ++i)
+			{
+				if (tunnel[i].state != TUNNELOPENING ||
+					tunnel[i].ip != ntohl(*(ipt *) & addr->sin_addr) ||
+					tunnel[i].port != ntohs(addr->sin_port) )
 					continue;
 				t = i;
 				break;
 			}
 		}
 
-		if (!t) {
+		if (!t)
+		{
 			if (!(t = new_tunnel()))
 			{
 				log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
@@ -1489,6 +1454,13 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						continue;
 					}
 					log(4, ntohl(addr->sin_addr.s_addr), s, t, "Hidden AVP\n");
+					// Unhide the AVP
+					n = unhide_avp(b, t, s, n);
+					if (n == 0)
+					{
+						fatal = flags;
+						continue;
+					}
 				}
 				if (*b & 0x3C)
 				{
@@ -1521,17 +1493,21 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					{
 						u16 rescode = ntohs(*(u16 *)(b));
 						const char* resdesc = "(unknown)";
-						if (message == 4) { /* StopCCN */
+						if (message == 4)
+						{ /* StopCCN */
 							if (rescode <= MAX_STOPCCN_RESULT_CODE)
 								resdesc = stopccn_result_codes[rescode];
-						} else if (message == 14) { /* CDN */
+						}
+						else if (message == 14)
+						{ /* CDN */
 							if (rescode <= MAX_CDN_RESULT_CODE)
 								resdesc = cdn_result_codes[rescode];
 						}
 
 						log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Result Code %d: %s\n",
 							rescode, resdesc);
-						if (n >= 4) {
+						if (n >= 4)
+						{
 							u16 errcode = ntohs(*(u16 *)(b + 2));
 							const char* errdesc = "(unknown)";
 							if (errcode <= MAX_ERROR_CODE)
@@ -1539,13 +1515,10 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error Code %d: %s\n",
 								errcode, errdesc);
 						}
-						if (n > 4) {
-							/* %*s doesn't work?? */
-							char *buf = (char *)strndup(b+4, n-4);
-							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %s\n",
-								buf);
-							free(buf);
-						}
+						if (n > 4)
+							log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Error String: %.*s\n",
+								n-4, b+4);
+
 						break;
 					}
 					break;
@@ -1582,8 +1555,8 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					// TBA - to send to RADIUS
 					break;
 				case 8:     // vendor name
-					memset(tunnel[t].vendor, 0, 128);
-					memcpy(tunnel[t].vendor, b, (n >= 127) ? 127 : n);
+					memset(tunnel[t].vendor, 0, sizeof(tunnel[t].vendor));
+					memcpy(tunnel[t].vendor, b, (n >= sizeof(tunnel[t].vendor) - 1) ? sizeof(tunnel[t].vendor) - 1 : n);
 					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Vendor name = \"%s\"\n", tunnel[t].vendor);
 					break;
 				case 9:     // assigned tunnel
@@ -1602,6 +1575,11 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						build_chap_response(b, 2, n, &chapresponse);
 					}
 					break;
+				case 13:    // Response
+					// Why did they send a response? We never challenge.
+					log(2, ntohl(addr->sin_addr.s_addr), s, t, "   received unexpected challenge response\n");
+				break;
+
 				case 14:    // assigned session
 					asession = session[s].far = ntohs(*(u16 *) (b));
 					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   assigned session = %d\n", asession);
@@ -1627,6 +1605,8 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					memcpy(calling, b, (n >= MAXTEL) ? (MAXTEL-1) : n);
 					log(4, ntohl(addr->sin_addr.s_addr), s, t, "   Calling <%s>\n", calling);
 					break;
+				case 23:    // subtype
+					break;
 				case 24:    // tx connect speed
 					if (n == 4)
 					{
@@ -1816,7 +1796,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 						if (!(r = radiusnew(s)))
 						{
 							log(1, ntohl(addr->sin_addr.s_addr), s, t, "No free RADIUS sessions for ICRQ\n");
-//							sessionkill(s, "no free RADIUS sesions");
+							sessionkill(s, "no free RADIUS sesions");
 							return;
 						}
 
@@ -1845,6 +1825,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					// TBA
 					break;
 				case 12:      // ICCN
+					if (amagic == 0) amagic = time_now;
 					session[s].magic = amagic; // set magic number
 					session[s].l2tp_flags = aflags; // set flags received
 					log(3, ntohl(addr->sin_addr.s_addr), s, t, "Magic %X Flags %X\n", amagic, aflags);
@@ -1990,26 +1971,25 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 	}
 }
 
-// read and process packet on tap
-void processtap(u8 * buf, int len)
+// read and process packet on tun
+void processtun(u8 * buf, int len)
 {
-	log_hex(5, "Receive TAP Data", buf, len);
-	STAT(tap_rx_packets);
-	INC_STAT(tap_rx_bytes, len);
-#ifdef STAT_CALLS
-	STAT(call_processtap);
-#endif
+	log_hex(5, "Receive TUN Data", buf, len);
+	STAT(tun_rx_packets);
+	INC_STAT(tun_rx_bytes, len);
+
+	CSTAT(call_processtun);
+
 	eth_rx_pkt++;
 	eth_rx += len;
 	if (len < 22)
 	{
-		log(1, 0, 0, 0, "Short tap packet %d bytes\n", len);
-		STAT(tap_rx_errors);
+		log(1, 0, 0, 0, "Short tun packet %d bytes\n", len);
+		STAT(tun_rx_errors);
 		return;
 	}
-	if (*(u16 *) (buf + 2) == htons(PKTARP)) // ARP
-		processarp(buf, len);
-	else if (*(u16 *) (buf + 2) == htons(PKTIP)) // IP
+
+	if (*(u16 *) (buf + 2) == htons(PKTIP)) // IP
 		processipout(buf, len);
 	// Else discard.
 }
@@ -2027,6 +2007,7 @@ int regular_cleanups(void)
 	int count=0,i;
 	u16 r;
 	static clockt next_acct = 0;
+	int a;
 
 	log(3, 0, 0, 0, "Begin regular cleanup\n");
 
@@ -2036,15 +2017,15 @@ int regular_cleanups(void)
 			continue;
 		if (radius[r].retry)
 		{
-			if (radius[r].retry <= config->current_time)
+			if (radius[r].retry <= TIME)
 				radiusretry(r);
 		} else
 			radius[r].retry = backoff(radius[r].try+1);	// Is this really needed? --mo
 	}
-	for (t = 1; t < config->cluster_highest_tunnelid; t++)
+	for (t = 1; t <= config->cluster_highest_tunnelid; t++)
 	{
 		// check for expired tunnels
-		if (tunnel[t].die && tunnel[t].die <= config->current_time)
+		if (tunnel[t].die && tunnel[t].die <= TIME)
 		{
 			STAT(tunnel_timeout);
 			tunnelkill(t, "Expired");
@@ -2054,7 +2035,7 @@ int regular_cleanups(void)
 		if (tunnel[t].retry && tunnel[t].controlc)
 		{
 			// resend pending messages as timeout on reply
-			if (tunnel[t].retry <= config->current_time)
+			if (tunnel[t].retry <= TIME)
 			{
 				controlt *c = tunnel[t].controls;
 				u8 w = tunnel[t].window;
@@ -2070,49 +2051,37 @@ int regular_cleanups(void)
 			}
 		}
 		// Send hello
-		if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < config->current_time + 600)
+		if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
 		{
 			controlt *c = controlnew(6); // sending HELLO
 			controladd(c, t, 0); // send the message
 			log(3, tunnel[t].ip, 0, t, "Sending HELLO message\n");
 		}
-	}
 
-	// Check for sessions that have been killed from the CLI
-	if (cli_session_kill[0])
-	{
-		int i;
-		for (i = 0; i < MAXSESSION && cli_session_kill[i]; i++)
+		// Check for tunnel changes requested from the CLI
+		if ((a = cli_tunnel_actions[t].action))
 		{
-			log(2, 0, cli_session_kill[i], 0, "Dropping session by CLI\n");
-			sessionshutdown(cli_session_kill[i], "Requested by administrator");
-			cli_session_kill[i] = 0;
-		}
-	}
-	// Check for tunnels that have been killed from the CLI
-	if (cli_tunnel_kill[0])
-	{
-		int i;
-		for (i = 1; i < MAXTUNNEL && cli_tunnel_kill[i]; i++)
-		{
-			log(2, 0, cli_tunnel_kill[i], 0, "Dropping tunnel by CLI\n");
-			tunnelshutdown(cli_tunnel_kill[i], "Requested by administrator");
-			cli_tunnel_kill[i] = 0;
+			cli_tunnel_actions[t].action = 0;
+			if (a & CLI_TUN_KILL)
+			{
+				log(2, tunnel[t].ip, 0, t, "Dropping tunnel by CLI\n");
+				tunnelshutdown(t, "Requested by administrator");
+			}
 		}
+
 	}
 
 	count = 0;
-	for (i = 1; i < config->cluster_highest_sessionid; i++)
+	for (i = 1; i <= config->cluster_highest_sessionid; i++)
 	{
-
 		s++;
-		if (s >= config->cluster_highest_sessionid)
+		if (s > config->cluster_highest_sessionid)
 			s = 1;
 
 		if (!session[s].tunnel)	// Session isn't in use
 			continue;
 
-		if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED) )
+		if (!session[s].die && session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
 		{
 			// IPCP has not completed yet. Resend
 			log(3, session[s].ip, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
@@ -2120,7 +2089,7 @@ int regular_cleanups(void)
 		}
 
 		// check for expired sessions
-		if (session[s].die && session[s].die <= config->current_time)
+		if (session[s].die && session[s].die <= TIME)
 		{
 			sessionkill(s, "Expired");
 			if (++count >= MAX_ACTIONS) break;
@@ -2142,7 +2111,8 @@ int regular_cleanups(void)
 			u8 b[MAXCONTROL] = {0};
 
 			u8 *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
-			if (!q) {
+			if (!q)
+			{
 				log(3, session[s].ip, s, t, "failed to send ECHO packet.\n");
 				continue;
 			}
@@ -2156,13 +2126,65 @@ int regular_cleanups(void)
 					(int)(time_now - session[s].last_packet));
 			tunnelsend(b, 24, session[s].tunnel); // send it
 			if (++count >= MAX_ACTIONS) break;
-			continue;
+		}
+
+		// Check for actions requested from the CLI
+		if ((a = cli_session_actions[s].action))
+		{
+			int send = 0;
+
+			cli_session_actions[s].action = 0;
+			if (a & CLI_SESS_KILL)
+			{
+				log(2, 0, s, session[s].tunnel, "Dropping session by CLI\n");
+				sessionshutdown(s, "Requested by administrator");
+				a = 0; // dead, no need to check for other actions
+			}
+
+			if (a & CLI_SESS_SNOOP)
+			{
+				log(2, 0, s, session[s].tunnel, "Snooping session by CLI (to %s:%d)\n",
+				    inet_toa(cli_session_actions[s].snoop_ip), cli_session_actions[s].snoop_port);
+
+				session[s].snoop_ip = cli_session_actions[s].snoop_ip;
+				session[s].snoop_port = cli_session_actions[s].snoop_port;
+				send++;
+			}
+
+			if (a & CLI_SESS_NOSNOOP)
+			{
+				log(2, 0, s, session[s].tunnel, "Unsnooping session by CLI\n");
+				session[s].snoop_ip = 0;
+				session[s].snoop_port = 0;
+				send++;
+			}
+
+			if (a & CLI_SESS_THROTTLE)
+			{
+				log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %dkb/s up and %dkb/s down)\n",
+				    cli_session_actions[s].throttle & 0xFFFF,
+				    cli_session_actions[s].throttle >> 16);
+
+				throttle_session(s, cli_session_actions[s].throttle);
+			}
+
+			if (a & CLI_SESS_NOTHROTTLE)
+			{
+				log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
+				throttle_session(s, 0);
+			}
+
+			if (send)
+				cluster_send_session(s);
+
+			if (++count >= MAX_ACTIONS) break;
 		}
 	}
-	if (config->accounting_dir && next_acct <= config->current_time)
+
+	if (*config->accounting_dir && next_acct <= TIME)
 	{
 		// Dump accounting data
-		next_acct = config->current_time + ACCT_TIME;
+		next_acct = TIME + ACCT_TIME;
 		dump_acct_info();
 	}
 
@@ -2181,18 +2203,31 @@ int regular_cleanups(void)
 int still_busy(void)
 {
 	int i;
-	static int last_talked = 0;
-	for (i = config->cluster_highest_tunnelid ; i > 0 ; --i) {
+	static clockt last_talked = 0;
+	static clockt start_busy_wait = 0;
+	if (start_busy_wait == 0)
+		start_busy_wait = TIME;
+
+	for (i = config->cluster_highest_tunnelid ; i > 0 ; --i)
+	{
 		if (!tunnel[i].controlc)
 			continue;
 
-		if (last_talked != config->current_time) {
-			log(2,0,0,0, "Tunnel %d still has an-acked control messages.\n", i);
-			last_talked = config->current_time;
+		if (last_talked != TIME)
+		{
+			log(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
+			last_talked = TIME;
 		}
 		return 1;
 	}
 
+	// We stop waiting for radius after BUSY_WAIT_TIMEOUT 1/10th seconds
+	if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIMEOUT)
+	{
+		log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
+		return 0;
+	}
+
 	for (i = 1; i < MAXRADIUS; i++)
 	{
 		if (radius[i].state == RADIUSNULL)
@@ -2200,9 +2235,10 @@ int still_busy(void)
 	        if (radius[i].state == RADIUSWAIT)
 			continue;
 
-		if (last_talked != config->current_time) {
+		if (last_talked != TIME)
+		{
 			log(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
-			last_talked = config->current_time;
+			last_talked = TIME;
 		}
 		return 1;
 	}
@@ -2210,27 +2246,27 @@ int still_busy(void)
 	return 0;
 }
 
-// main loop - gets packets on tap or udp and processes them
+// main loop - gets packets on tun or udp and processes them
 void mainloop(void)
 {
 	fd_set cr;
 	int cn, i;
 	u8 buf[65536];
 	struct timeval to;
-	time_t next_cluster_ping = 0;	// default 1 second pings.
-	clockt next_clean = time_now + config->cleanup_interval;
+	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, tapfd=%d, cluster_sockfd=%d, controlfd=%d\n",
-			udpfd, tapfd, cluster_sockfd, controlfd);
+	log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
+			udpfd, tunfd, cluster_sockfd, controlfd);
 
 	FD_ZERO(&cr);
 	FD_SET(udpfd, &cr);
-	FD_SET(tapfd, &cr);
+	FD_SET(tunfd, &cr);
 	FD_SET(controlfd, &cr);
 	FD_SET(clifd, &cr);
 	if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
 	cn = udpfd;
-	if (cn < tapfd) cn = tapfd;
+	if (cn < tunfd) cn = tunfd;
 	if (cn < controlfd) cn = controlfd;
 	if (cn < clifd) cn = clifd;
 	if (cn < cluster_sockfd) cn = cluster_sockfd;
@@ -2286,7 +2322,7 @@ void mainloop(void)
 		n = select(n + 1, &r, 0, 0, &to);
 #endif /* BGP */
 
-		config->current_time = now();
+		TIME = now();
 		if (n < 0)
 		{
 			if (errno == EINTR)
@@ -2311,13 +2347,13 @@ void mainloop(void)
 						break;
 				}
 			}
-			if (FD_ISSET(tapfd, &r))
+			if (FD_ISSET(tunfd, &r))
 			{
 				int c, n;
 				for (c = 0; c < config->multi_read_count; c++)
 				{
-					if ((n = read(tapfd, buf, sizeof(buf))) > 0)
-						processtap(buf, n);
+					if ((n = read(tunfd, buf, sizeof(buf))) > 0)
+						processtun(buf, n);
 					else
 						break;
 				}
@@ -2325,13 +2361,17 @@ void mainloop(void)
 			for (i = 0; i < config->num_radfds; i++)
 				if (FD_ISSET(radfds[i], &r))
 					processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
-			if (FD_ISSET(cluster_sockfd, &r)) {
+
+			if (FD_ISSET(cluster_sockfd, &r))
+			{
 				int size;
 				size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
 				processcluster(buf, size, addr.sin_addr.s_addr);
 			}
+
 			if (FD_ISSET(controlfd, &r))
 				processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
+
 			if (FD_ISSET(clifd, &r))
 			{
 				struct sockaddr_in addr;
@@ -2352,16 +2392,22 @@ void mainloop(void)
 		}
 
 			// Runs on every machine (master and slaves).
-		if (cluster_sockfd && next_cluster_ping <= time_now)
+		if (cluster_sockfd && next_cluster_ping <= TIME)
 		{
 			// Check to see which of the cluster is still alive..
-			next_cluster_ping = time_now + 1;
-			cluster_send_ping(basetime);
 
-			cluster_check_master();
+			cluster_send_ping(basetime);	// Only does anything if we're a slave
+			cluster_check_master();		// ditto.
+
+			cluster_heartbeat();		// Only does anything if we're a master.
+			cluster_check_slaves();		// ditto.
 
-			cluster_heartbeat(config->cluster_highest_sessionid, sessionfree, config->cluster_highest_tunnelid);	// Only does anything if we're a master.
 			master_update_counts();		// If we're a slave, send our byte counters to our master.
+
+			if (config->cluster_iam_master && !config->cluster_iam_uptodate)
+				next_cluster_ping = TIME + 1; // out-of-date slaves, do fast updates
+			else
+				next_cluster_ping = TIME + config->cluster_hb_interval;
 		}
 
 			// Run token bucket filtering queue..
@@ -2369,8 +2415,9 @@ void mainloop(void)
 			// Runs on all machines both master and slave.
 		{
 			static clockt last_run = 0;
-			if (last_run != config->current_time) {
-				last_run = config->current_time;
+			if (last_run != TIME)
+			{
+				last_run = TIME;
 				tbf_run_timer();
 			}
 		}
@@ -2379,10 +2426,15 @@ void mainloop(void)
 		 * something to read, else under load this will never actually run....
 		 *
 		 */
-		if (config->cluster_iam_master && next_clean <= time_now) {
-			if (regular_cleanups()) { // Did it finish?
+		if (config->cluster_iam_master && next_clean <= time_now)
+		{
+			if (regular_cleanups())
+			{
+				// Did it finish?
 				next_clean = time_now + 1 ;	// Didn't finish. Check quickly.
-			} else {
+			}
+			else
+			{
 				next_clean = time_now + config->cleanup_interval; // Did. Move to next interval.
 			}
 		}
@@ -2398,11 +2450,8 @@ void mainloop(void)
 	}
 
 		// Are we the master and shutting down??
-	if (config->cluster_iam_master) {
-
-		cluster_heartbeat(config->cluster_highest_sessionid, sessionfree,
-			config->cluster_highest_tunnelid);	// Flush any queued changes..
-	}
+	if (config->cluster_iam_master)
+		cluster_heartbeat(); // Flush any queued changes..
 
 		// Ok. Notify everyone we're shutting down. If we're
 		// the master, this will force an election.
@@ -2413,81 +2462,78 @@ void mainloop(void)
 }
 
 // Init data structures
-void initdata(void)
+void initdata(int optdebug, char *optconfig)
 {
 	int i;
 
-	_statistics = mmap(NULL, sizeof(struct Tstats), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (_statistics == MAP_FAILED)
+	if (!(_statistics = shared_malloc(sizeof(struct Tstats))))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for _statistics: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for _statistics: %s\n", strerror(errno));
 		exit(1);
 	}
-	config = mmap(NULL, sizeof(struct configt), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (config == MAP_FAILED)
+	if (!(config = shared_malloc(sizeof(struct configt))))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for configuration: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for configuration: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(config, 0, sizeof(struct configt));
 	time(&config->start_time);
-	strncpy(config->config_file, CONFIGFILE, sizeof(config->config_file) - 1);
-	tunnel = mmap(NULL, sizeof(tunnelt) * MAXTUNNEL, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (tunnel == MAP_FAILED)
+	strncpy(config->config_file, optconfig, strlen(optconfig));
+	config->debug = optdebug;
+	config->num_tbfs = MAXTBFS;
+	config->rl_rate = 28; // 28kbps
+
+	if (!(tunnel = shared_malloc(sizeof(tunnelt) * MAXTUNNEL)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for tunnels: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for tunnels: %s\n", strerror(errno));
 		exit(1);
 	}
-	session = mmap(NULL, sizeof(sessiont) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (session == MAP_FAILED)
+	if (!(session = shared_malloc(sizeof(sessiont) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for sessions: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for sessions: %s\n", strerror(errno));
 		exit(1);
 	}
 
-	sess_count = mmap(NULL, sizeof(sessioncountt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (sess_count == MAP_FAILED)
+	if (!(sess_count = shared_malloc(sizeof(sessioncountt) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for sessions_count: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for sessions_count: %s\n", strerror(errno));
 		exit(1);
 	}
 
-	radius = mmap(NULL, sizeof(radiust) * MAXRADIUS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (radius == MAP_FAILED)
+	if (!(radius = shared_malloc(sizeof(radiust) * MAXRADIUS)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for radius: %s\n", strerror(errno));
 		exit(1);
 	}
-	ip_address_pool = mmap(NULL, sizeof(ippoolt) * MAXIPPOOL, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (ip_address_pool == MAP_FAILED)
+
+	if (!(ip_address_pool = shared_malloc(sizeof(ippoolt) * MAXIPPOOL)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for ip_address_pool: %s\n", strerror(errno));
 		exit(1);
 	}
+
 #ifdef RINGBUFFER
-	ringbuffer = mmap(NULL, sizeof(struct Tringbuffer), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (ringbuffer == MAP_FAILED)
+	if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for radius: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(ringbuffer, 0, sizeof(struct Tringbuffer));
 #endif
 
-	cli_session_kill = mmap(NULL, sizeof(sessionidt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (cli_session_kill == MAP_FAILED)
+	if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for cli session kill: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
 		exit(1);
 	}
-	memset(cli_session_kill, 0, sizeof(sessionidt) * MAXSESSION);
-	cli_tunnel_kill = mmap(NULL, sizeof(tunnelidt) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (cli_tunnel_kill == MAP_FAILED)
+	memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
+
+	if (!(cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for cli tunnel kill: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
 		exit(1);
 	}
-	memset(cli_tunnel_kill, 0, sizeof(tunnelidt) * MAXSESSION);
+	memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);
 
 	memset(tunnel, 0, sizeof(tunnelt) * MAXTUNNEL);
 	memset(session, 0, sizeof(sessiont) * MAXSESSION);
@@ -2495,7 +2541,8 @@ void initdata(void)
 	memset(ip_address_pool, 0, sizeof(ippoolt) * MAXIPPOOL);
 
 		// Put all the sessions on the free list marked as undefined.
-	for (i = 1; i < MAXSESSION - 1; i++) {
+	for (i = 1; i < MAXSESSION - 1; i++)
+	{
 		session[i].next = i + 1;
 		session[i].tunnel = T_UNDEF;	// mark it as not filled in.
 	}
@@ -2503,22 +2550,23 @@ void initdata(void)
 	sessionfree = 1;
 
 		// Mark all the tunnels as undefined (waiting to be filled in by a download).
-	for (i = 1; i < MAXTUNNEL- 1; i++) {
+	for (i = 1; i < MAXTUNNEL- 1; i++)
 		tunnel[i].state = TUNNELUNDEF;	// mark it as not filled in.
-	}
 
 	if (!*hostname)
 	{
+		char *p;
 		// Grab my hostname unless it's been specified
 		gethostname(hostname, sizeof(hostname));
+		if ((p = strchr(hostname, '.'))) *p = 0;
 	}
+
 	_statistics->start_time = _statistics->last_reset = time(NULL);
 
 #ifdef BGP
-	bgp_peers = mmap(NULL, sizeof(struct bgp_peer) * BGP_NUM_PEERS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (bgp_peers == MAP_FAILED)
+	if (!(bgp_peers = shared_malloc(sizeof(struct bgp_peer) * BGP_NUM_PEERS)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for bgp: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for bgp: %s\n", strerror(errno));
 		exit(1);
 	}
 #endif /* BGP */
@@ -2536,13 +2584,13 @@ int assign_ip_address(sessionidt s)
 {
 	u32 i;
 	int best = -1;
-	clockt best_time = time_now;
+	time_t best_time = time_now;
 	char *u = session[s].user;
 	char reuse = 0;
 
-#ifdef STAT_CALLS
-	STAT(call_assign_ip_address);
-#endif
+
+	CSTAT(call_assign_ip_address);
+
 	for (i = 1; i < ip_pool_size; i++)
 	{
 		if (!ip_address_pool[i].address || ip_address_pool[i].assigned)
@@ -2606,9 +2654,9 @@ void free_ip_address(sessionidt s)
 	ip_address_pool[i].session = 0;
 	ip_address_pool[i].last = time_now;
 
-#ifdef STAT_CALLS
-	STAT(call_free_ip_address);
-#endif
+
+	CSTAT(call_free_ip_address);
+
 }
 
 //
@@ -2625,7 +2673,8 @@ void rebuild_address_pool(void)
 		//
 		// Zero the IP pool allocation, and build
 		// a map from IP address to pool index.
-	for (i = 1; i < MAXIPPOOL; ++i) {
+	for (i = 1; i < MAXIPPOOL; ++i)
+	{
 		ip_address_pool[i].assigned = 0;
 		ip_address_pool[i].session = 0;
 		if (!ip_address_pool[i].address)
@@ -2634,24 +2683,28 @@ void rebuild_address_pool(void)
 		cache_ipmap(ip_address_pool[i].address, -i);	// Map pool IP to pool index.
 	}
 
-	for (i = 0; i < MAXSESSION; ++i) {
+	for (i = 0; i < MAXSESSION; ++i)
+	{
 		int ipid;
 		if (!session[i].ip || !session[i].tunnel)
 			continue;
 		ipid = - lookup_ipmap(htonl(session[i].ip));
 
-		if (session[i].ip_pool_index < 0) {	// Not allocated out of the pool.
+		if (session[i].ip_pool_index < 0)
+		{
+			// Not allocated out of the pool.
 			if (ipid < 1)			// Not found in the pool either? good.
 				continue;
 
-			log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!",
+			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.
 		}
 
 
-		if (ipid > MAXIPPOOL || ipid < 0) {
+		if (ipid > MAXIPPOOL || ipid < 0)
+		{
 			log(0, 0, i, 0, "Session %d has a pool IP that's not found in the pool! (%d)\n", i, ipid);
 			ipid = -1;
 			session[i].ip_pool_index = ipid;
@@ -2747,7 +2800,7 @@ void initippool()
 			src = inet_addr(buf);
 			if (src == INADDR_NONE)
 			{
-				log(0, 0, 0, 0, "Invalid address pool IP %s", buf);
+				log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
 				exit(1);
 			}
 			// This entry is for a specific IP only
@@ -2790,9 +2843,11 @@ void initippool()
 
 void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 {
+	struct sockaddr_in snoop_addr = {0};
 	if (!destination || !port || snoopfd <= 0 || size <= 0 || !packet)
 		return;
 
+	snoop_addr.sin_family = AF_INET;
 	snoop_addr.sin_addr.s_addr = destination;
 	snoop_addr.sin_port = ntohs(port);
 
@@ -2805,67 +2860,70 @@ void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 
 void dump_acct_info()
 {
-    char filename[1024];
-    char timestr[64];
-    time_t t = time(NULL);
-    int i;
-    FILE *f = NULL;
+	char filename[1024];
+	char timestr[64];
+	time_t t = time(NULL);
+	int i;
+	FILE *f = NULL;
 
-#ifdef STAT_CALLS
-	STAT(call_dump_acct_info);
-#endif
-    strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
-    snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);
 
-    for (i = 0; i < MAXSESSION; i++)
-    {
-	if (!session[i].opened || !session[i].ip || !session[i].cin || !session[i].cout || !*session[i].user || session[i].walled_garden)
-		continue;
-	if (!f)
+	CSTAT(call_dump_acct_info);
+
+	strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
+	snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);
+
+	for (i = 0; i < MAXSESSION; i++)
 	{
-	    time_t now = time(NULL);
-	    if (!(f = fopen(filename, "w")))
-	    {
-		    log(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
-		    return;
-	    }
-	    log(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
-	    fprintf(f, "# dslwatch.pl dump file V1.01\n"
-		"# host: %s\n"
-		"# time: %ld\n"
-		"# uptime: %ld\n"
-		"# format: username ip qos uptxoctets downrxoctets\n",
-		    hostname,
-		    now,
-		    now - basetime);
-	}
-
-	log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
-	fprintf(f, "%s %s %d %u %u\n",
-	    session[i].user,				// username
-	    inet_toa(htonl(session[i].ip)),		// ip
-	    (session[i].throttle) ? 2 : 1,		// qos
-	    (u32)session[i].cin,		// uptxoctets
-	    (u32)session[i].cout);		// downrxoctets
-
-	session[i].pin = session[i].cin = 0;
-	session[i].pout = session[i].cout = 0;
-    }
-
-    if (f) fclose(f);
+		if (!session[i].opened || !session[i].ip || (!session[i].cin && !session[i].cout) || !*session[i].user || session[i].walled_garden)
+			continue;
+		if (!f)
+		{
+			time_t now = time(NULL);
+			if (!(f = fopen(filename, "w")))
+			{
+				log(0, 0, 0, 0, "Can't write accounting info to %s: %s\n", filename, strerror(errno));
+				return ;
+			}
+			log(3, 0, 0, 0, "Dumping accounting information to %s\n", filename);
+			fprintf(f, "# dslwatch.pl dump file V1.01\n"
+			        "# host: %s\n"
+			        "# time: %ld\n"
+			        "# uptime: %ld\n"
+			        "# format: username ip qos uptxoctets downrxoctets\n",
+			        hostname,
+			        now,
+			        now - basetime);
+		}
+
+		log(4, 0, 0, 0, "Dumping accounting information for %s\n", session[i].user);
+		fprintf(f, "%s %s %d %u %u\n",
+		        session[i].user,		// username
+		        inet_toa(htonl(session[i].ip)),	// ip
+		        (session[i].throttle) ? 2 : 1,	// qos
+		        (u32)session[i].cin,		// uptxoctets
+		        (u32)session[i].cout);		// downrxoctets
+
+		session[i].pin = session[i].cin = 0;
+		session[i].pout = session[i].cout = 0;
+	}
+
+	if (f)
+		fclose(f);
 }
 
 // Main program
 int main(int argc, char *argv[])
 {
 	int o;
+	int optdebug = 0;
+	char *optconfig = CONFIGFILE;
 
 	_program_name = strdup(argv[0]);
 
 	time(&basetime);             // start clock
 
 	// scan args
-	while ((o = getopt(argc, argv, "vc:h:a:")) >= 0)
+	while ((o = getopt(argc, argv, "dvc:h:")) >= 0)
 	{
 		switch (o)
 		{
@@ -2875,12 +2933,14 @@ int main(int argc, char *argv[])
 				if (fork()) exit(0);
 				break;
 			case 'v':
-				config->debug++;
+				optdebug++;
+				break;
+			case 'c':
+			    	optconfig = optarg;
 				break;
 			case 'h':
-				strncpy(hostname, optarg, 999);
+				snprintf(hostname, sizeof(hostname), "%s", optarg);
 				break;
-			case '?':
 			default:
 				printf("Args are:\n"
 				       "\t-d\tDetach from terminal\n"
@@ -2896,20 +2956,21 @@ int main(int argc, char *argv[])
 
 	// Start the timer routine off
 	time(&time_now);
-	strftime(time_now_string, 64, "%Y-%m-%d %H:%M:%S", localtime(&time_now));
+	strftime(time_now_string, sizeof(time_now_string), "%Y-%m-%d %H:%M:%S", localtime(&time_now));
 	signal(SIGALRM, sigalrm_handler);
 	siginterrupt(SIGALRM, 0);
 
 	initiptables();
 	initplugins();
-	initdata();
-	init_tbf();
-	init_cli();
+	initdata(optdebug, optconfig);
+
 	read_config_file();
+	init_tbf(config->num_tbfs);
+	init_cli(hostname);
 
-	log(0, 0, 0, 0, "$Id: l2tpns.c,v 1.8 2004-06-23 03:52:24 fred_nerk Exp $\n"
-			"(c) Copyright 2003, 2004 Optus Internet Engineering\n"
-			"(c) Copyright 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;
@@ -2954,17 +3015,17 @@ int main(int argc, char *argv[])
 	signal(SIGPIPE, SIG_IGN);
 	bgp_setup(config->as_number);
 	bgp_add_route(config->bind_address, 0xffffffff);
-        if (*config->bgp_peer[0])
+	if (*config->bgp_peer[0])
 		bgp_start(&bgp_peers[0], config->bgp_peer[0],
 		    config->bgp_peer_as[0], 0); /* 0 = routing disabled */
 
-        if (*config->bgp_peer[1])
+	if (*config->bgp_peer[1])
 		bgp_start(&bgp_peers[1], config->bgp_peer[1],
 		    config->bgp_peer_as[1], 0);
 #endif /* BGP */
 
-	inittap();
-	log(1, 0, 0, 0, "Set up on interface %s\n", config->tapdevice);
+	inittun();
+	log(1, 0, 0, 0, "Set up on interface %s\n", config->tundevice);
 
 	initudp();
 	initrad();
@@ -2978,6 +3039,15 @@ int main(int argc, char *argv[])
 	signal(SIGQUIT, sigquit_handler);
 	signal(SIGCHLD, sigchild_handler);
 
+	// Prevent us from getting paged out
+	if (config->lock_pages)
+	{
+		if (!mlockall(MCL_CURRENT))
+			log(1, 0, 0, 0, "Locking pages into memory\n");
+		else
+			log(0, 0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
+	}
+
 	alarm(1);
 
 	// Drop privileges here
@@ -3000,6 +3070,10 @@ int main(int argc, char *argv[])
 	/* remove plugins (so cleanup code gets run) */
 	plugins_done();
 
+	// Remove the PID file if we wrote it
+	if (config->wrote_pid && *config->pid_file == '/')
+		unlink(config->pid_file);
+
 	/* kill CLI children */
 	signal(SIGTERM, SIG_IGN);
 	kill(0, SIGTERM);
@@ -3039,7 +3113,7 @@ void sigalrm_handler(int junk)
 
 	// Update the internal time counter
 	time(&time_now);
-	strftime(time_now_string, 64, "%Y-%m-%d %H:%M:%S", localtime(&time_now));
+	strftime(time_now_string, sizeof(time_now_string), "%Y-%m-%d %H:%M:%S", localtime(&time_now));
 	alarm(1);
 
 	{
@@ -3086,168 +3160,178 @@ void sigchild_handler(int signal)
 
 void read_state()
 {
-    struct stat sb;
-    int i;
-    ippoolt itmp;
-    FILE *f;
-    char magic[sizeof(DUMP_MAGIC)-1];
-    u32 buf[2];
+	struct stat sb;
+	int i;
+	ippoolt itmp;
+	FILE *f;
+	char magic[sizeof(DUMP_MAGIC) - 1];
+	u32 buf[2];
 
-    if (!config->save_state)
-    {
-	unlink(STATEFILE);
-	return;
-    }
+	if (!config->save_state)
+	{
+		unlink(STATEFILE);
+		return ;
+	}
 
-    if (stat(STATEFILE, &sb) < 0)
-    {
-	unlink(STATEFILE);
-	return;
-    }
+	if (stat(STATEFILE, &sb) < 0)
+	{
+		unlink(STATEFILE);
+		return ;
+	}
+
+	if (sb.st_mtime < (time(NULL) - 60))
+	{
+		log(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+		unlink(STATEFILE);
+		return ;
+	}
 
-    if (sb.st_mtime < (time(NULL) - 60))
-    {
-	log(0, 0, 0, 0, "State file is too old to read, ignoring\n");
+	f = fopen(STATEFILE, "r");
 	unlink(STATEFILE);
-	return;
-    }
-
-    f = fopen(STATEFILE, "r");
-    unlink(STATEFILE);
-
-    if (!f)
-    {
-	log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
-	exit(1);
-    }
-
-    if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
-    {
-	log(0, 0, 0, 0, "Bad state file magic\n");
-	exit(1);
-    }
-
-    log(1, 0, 0, 0, "Reading state information\n");
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
-    {
-	log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
-	exit(1);
-    }
-
-    if (buf[0] > ip_pool_size)
-    {
-	log(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
-	exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
-    for (i = 0; i < buf[0]; i++)
-    {
-	if (fread(&itmp, sizeof(itmp), 1, f) != 1)
-	{
-	    log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
-	    exit(1);
-	}
-
-	if (itmp.address != ip_address_pool[i].address)
-	{
-	    log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
-	    exit(1);
-	}
-
-	memcpy(&ip_address_pool[i], &itmp, sizeof(itmp));
-    }
-
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
-    {
-	log(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
-	exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
-    if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
-    {
-	log(0, 0, 0, 0, "Error reading tunnel data from state file\n");
-	exit(1);
-    }
-
-    for (i = 0; i < MAXTUNNEL; i++)
-    {
-	tunnel[i].controlc = 0;
-	tunnel[i].controls = NULL;
-	tunnel[i].controle = NULL;
-	if (*tunnel[i].hostname)
-	    log(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
-    }
-
-    if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
-    {
-	log(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
-	exit(1);
-    }
-
-    log(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
-    if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
-    {
-	log(0, 0, 0, 0, "Error reading session data from state file\n");
-	exit(1);
-    }
-
-    for (i = 0; i < MAXSESSION; i++)
-    {
-	session[i].tbf_in = 0;
-	session[i].tbf_out = 0;
-	if (session[i].opened)
-	{
-	    log(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
-	    if (session[i].ip)
-		sessionsetup(session[i].tunnel, i);
-	}
-    }
-
-    fclose(f);
-    log(0, 0, 0, 0, "Loaded saved state information\n");
+
+	if (!f)
+	{
+		log(0, 0, 0, 0, "Can't read state file: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	if (fread(magic, sizeof(magic), 1, f) != 1 || strncmp(magic, DUMP_MAGIC, sizeof(magic)))
+	{
+		log(0, 0, 0, 0, "Bad state file magic\n");
+		exit(1);
+	}
+
+	log(1, 0, 0, 0, "Reading state information\n");
+	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] > MAXIPPOOL || buf[1] != sizeof(ippoolt))
+	{
+		log(0, 0, 0, 0, "Error/mismatch reading ip pool header from state file\n");
+		exit(1);
+	}
+
+	if (buf[0] > ip_pool_size)
+	{
+		log(0, 0, 0, 0, "ip pool has shrunk!  state = %d, current = %d\n", buf[0], ip_pool_size);
+		exit(1);
+	}
+
+	log(2, 0, 0, 0, "Loading %u ip addresses\n", buf[0]);
+	for (i = 0; i < buf[0]; i++)
+	{
+		if (fread(&itmp, sizeof(itmp), 1, f) != 1)
+		{
+			log(0, 0, 0, 0, "Error reading ip %d from state file: %s\n", i, strerror(errno));
+			exit(1);
+		}
+
+		if (itmp.address != ip_address_pool[i].address)
+		{
+			log(0, 0, 0, 0, "Mismatched ip %d from state file: pool may only be extended\n", i);
+			exit(1);
+		}
+
+		memcpy(&ip_address_pool[i], &itmp, sizeof(itmp));
+	}
+
+	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXTUNNEL || buf[1] != sizeof(tunnelt))
+	{
+		log(0, 0, 0, 0, "Error/mismatch reading tunnel header from state file\n");
+		exit(1);
+	}
+
+	log(2, 0, 0, 0, "Loading %u tunnels\n", MAXTUNNEL);
+	if (fread(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
+	{
+		log(0, 0, 0, 0, "Error reading tunnel data from state file\n");
+		exit(1);
+	}
+
+	for (i = 0; i < MAXTUNNEL; i++)
+	{
+		tunnel[i].controlc = 0;
+		tunnel[i].controls = NULL;
+		tunnel[i].controle = NULL;
+		if (*tunnel[i].hostname)
+			log(3, 0, 0, 0, "Created tunnel for %s\n", tunnel[i].hostname);
+	}
+
+	if (fread(buf, sizeof(buf), 1, f) != 1 || buf[0] != MAXSESSION || buf[1] != sizeof(sessiont))
+	{
+		log(0, 0, 0, 0, "Error/mismatch reading session header from state file\n");
+		exit(1);
+	}
+
+	log(2, 0, 0, 0, "Loading %u sessions\n", MAXSESSION);
+	if (fread(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
+	{
+		log(0, 0, 0, 0, "Error reading session data from state file\n");
+		exit(1);
+	}
+
+	for (i = 0; i < MAXSESSION; i++)
+	{
+		session[i].tbf_in = 0;
+		session[i].tbf_out = 0;
+		if (session[i].opened)
+		{
+			log(2, 0, i, 0, "Loaded active session for user %s\n", session[i].user);
+			if (session[i].ip)
+				sessionsetup(session[i].tunnel, i);
+		}
+	}
+
+	fclose(f);
+	log(0, 0, 0, 0, "Loaded saved state information\n");
 }
 
 void dump_state()
 {
-    FILE *f;
-    u32 buf[2];
+	FILE *f;
+	u32 buf[2];
 
-    if (!config->save_state)
-	return;
+	if (!config->save_state)
+		return;
 
-    do {
-	if (!(f = fopen(STATEFILE, "w")))
-	    break;
+	do
+	{
+		if (!(f = fopen(STATEFILE, "w")))
+			break;
 
-	log(1, 0, 0, 0, "Dumping state information\n");
+		log(1, 0, 0, 0, "Dumping state information\n");
 
-	if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC)-1, 1, f) != 1) break;
+		if (fwrite(DUMP_MAGIC, sizeof(DUMP_MAGIC) - 1, 1, f) != 1)
+			break;
 
-	log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
-	buf[0] = ip_pool_size;
-	buf[1] = sizeof(ippoolt);
-	if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-	if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size) break;
+		log(2, 0, 0, 0, "Dumping %u ip addresses\n", ip_pool_size);
+		buf[0] = ip_pool_size;
+		buf[1] = sizeof(ippoolt);
+		if (fwrite(buf, sizeof(buf), 1, f) != 1)
+			break;
+		if (fwrite(ip_address_pool, sizeof(ippoolt), ip_pool_size, f) != ip_pool_size)
+			break;
 
-	log(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
-	buf[0] = MAXTUNNEL;
-	buf[1] = sizeof(tunnelt);
-	if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-	if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL) break;
+		log(2, 0, 0, 0, "Dumping %u tunnels\n", MAXTUNNEL);
+		buf[0] = MAXTUNNEL;
+		buf[1] = sizeof(tunnelt);
+		if (fwrite(buf, sizeof(buf), 1, f) != 1)
+			break;
+		if (fwrite(tunnel, sizeof(tunnelt), MAXTUNNEL, f) != MAXTUNNEL)
+			break;
 
-	log(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
-	buf[0] = MAXSESSION;
-	buf[1] = sizeof(sessiont);
-	if (fwrite(buf, sizeof(buf), 1, f) != 1) break;
-	if (fwrite(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION) break;
+		log(2, 0, 0, 0, "Dumping %u sessions\n", MAXSESSION);
+		buf[0] = MAXSESSION;
+		buf[1] = sizeof(sessiont);
+		if (fwrite(buf, sizeof(buf), 1, f) != 1)
+			break;
+		if (fwrite(session, sizeof(sessiont), MAXSESSION, f) != MAXSESSION)
+			break;
 
-	if (fclose(f) == 0) return; // OK
-    } while (0);
+		if (fclose(f) == 0)
+			return ; // OK
+	}
+	while (0);
 
-    log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
-    unlink(STATEFILE);
+	log(0, 0, 0, 0, "Can't write state information: %s\n", strerror(errno));
+	unlink(STATEFILE);
 }
 
 void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **challenge_response)
@@ -3276,18 +3360,20 @@ void build_chap_response(char *challenge, u8 id, u16 challenge_length, char **ch
 
 static int facility_value(char *name)
 {
-    int i;
-    for (i = 0; facilitynames[i].c_name; i++)
-    {
-	if (strcmp(facilitynames[i].c_name, name) == 0)
-	    return facilitynames[i].c_val;
-    }
-    return 0;
+	int i;
+	for (i = 0; facilitynames[i].c_name; i++)
+	{
+		if (strcmp(facilitynames[i].c_name, name) == 0)
+			return facilitynames[i].c_val;
+	}
+	return 0;
 }
 
 void update_config()
 {
 	int i;
+	static int timeout = 0;
+	static int interval = 0;
 
 	// Update logging
 	closelog();
@@ -3332,7 +3418,21 @@ void update_config()
 	// Update radius
 	config->numradiusservers = 0;
 	for (i = 0; i < MAXRADSERVER; i++)
-		if (config->radiusserver[i]) config->numradiusservers++;
+		if (config->radiusserver[i])
+		{
+			config->numradiusservers++;
+			// Set radius port: if not set, take the port from the
+			// first radius server.  For the first radius server,
+			// take the #defined default value from l2tpns.h
+
+			// test twice, In case someone works with
+			// a secondary radius server without defining
+			// a primary one, this will work even then.
+			if (i>0 && !config->radiusport[i])
+				config->radiusport[i] = config->radiusport[i-1];
+			if (!config->radiusport[i])
+				config->radiusport[i] = RADPORT;
+		}
 
 	if (!config->numradiusservers)
 	{
@@ -3359,11 +3459,53 @@ void update_config()
 	}
 	memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
 	if (!config->cleanup_interval) config->cleanup_interval = 10;
-	if (!config->multi_read_count) config->multi_read_count = 1;
+	if (!config->multi_read_count) config->multi_read_count = 10;
 	if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
 	if (!*config->cluster_interface)
 		strncpy(config->cluster_interface, DEFAULT_MCAST_INTERFACE, sizeof(config->cluster_interface) - 1);
 
+	if (!config->cluster_hb_interval)
+		config->cluster_hb_interval = PING_INTERVAL;	// Heartbeat every 0.5 seconds.
+
+	if (!config->cluster_hb_timeout)
+		config->cluster_hb_timeout = HB_TIMEOUT;	// 10 missed heartbeat triggers an election.
+
+	if (interval != config->cluster_hb_interval || timeout != config->cluster_hb_timeout)
+	{
+		// Paranoia:  cluster_check_master() treats 2 x interval + 1 sec as
+		// late, ensure we're sufficiently larger than that
+		int t = 4 * config->cluster_hb_interval + 11;
+
+		if (config->cluster_hb_timeout < t)
+		{
+			log(0,0,0,0, "Heartbeat timeout %d too low, adjusting to %d\n", config->cluster_hb_timeout, t);
+			config->cluster_hb_timeout = t;
+		}
+
+		// Push timing changes to the slaves immediately if we're the master
+		if (config->cluster_iam_master)
+			cluster_heartbeat();
+
+		interval = config->cluster_hb_interval;
+		timeout = config->cluster_hb_timeout;
+	}
+
+	// Write PID file
+	if (*config->pid_file == '/' && !config->wrote_pid)
+	{
+		FILE *f;
+		if ((f = fopen(config->pid_file, "w")))
+		{
+			fprintf(f, "%d\n", getpid());
+			fclose(f);
+			config->wrote_pid = 1;
+		}
+		else
+		{
+			log(0, 0, 0, 0, "Can't write to PID file %s: %s\n", config->pid_file, strerror(errno));
+		}
+	}
+
 	config->reload_config = 0;
 }
 
@@ -3372,7 +3514,8 @@ void read_config_file()
 	FILE *f;
 
 	if (!config->config_file) return;
-	if (!(f = fopen(config->config_file, "r"))) {
+	if (!(f = fopen(config->config_file, "r")))
+	{
 		fprintf(stderr, "Can't open config file %s: %s\n", config->config_file, strerror(errno));
 		return;
 	}
@@ -3391,9 +3534,8 @@ int sessionsetup(tunnelidt t, sessionidt s)
 	char *user;
 	sessionidt i;
 	int r;
-#ifdef STAT_CALLS
-	STAT(call_sessionsetup);
-#endif
+
+	CSTAT(call_sessionsetup);
 
 	log(3, session[s].ip, s, t, "Doing session setup for session\n");
 
@@ -3404,7 +3546,11 @@ int sessionsetup(tunnelidt t, sessionidt s)
 			log(3, 0, s, t, "   No IP allocated. Assigned %s from pool\n",
 					inet_toa(htonl(session[s].ip)));
 		else
+		{
 			log(0, 0, s, t, "   No IP allocated. The IP address pool is FULL!\n");
+			sessionshutdown(s, "No IP addresses available");
+			return 0;
+		}
 	}
 
 
@@ -3439,10 +3585,12 @@ int sessionsetup(tunnelidt t, sessionidt s)
 	for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
 		routeset(s, session[s].route[r].ip, session[s].route[r].mask, session[s].ip, 1);
 
-	if (!session[s].sid) {	// did this session just finish radius?
+	if (!session[s].unique_id)
+	{
+		// did this session just finish radius?
 		log(3, session[s].ip, s, t, "Sending initial IPCP to client\n");
 		sendipcp(t, s);
-		session[s].sid = ++last_sid;
+		session[s].unique_id = ++last_id;
 	}
 
 	// Run the plugin's against this new session.
@@ -3483,7 +3631,8 @@ int load_session(sessionidt s, sessiont *new)
 
 		// Sanity checks.
 	if (new->ip_pool_index >= MAXIPPOOL ||
-		new->tunnel >= MAXTUNNEL) {
+		new->tunnel >= MAXTUNNEL)
+	{
 		log(0,0,s,0, "Strange session update received!\n");
 			// FIXME! What to do here?
 		return 0;
@@ -3501,13 +3650,22 @@ int load_session(sessionidt s, sessiont *new)
 	{
 		if (session[s].ip)	// If there's an old one, remove it.
 		{
+			// 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_pool_index == -1) // static IP
 				routeset(s, session[s].ip, 0, 0, 0);
-			else		// It's part of the IP pool, add it manually.
+			else		// It's part of the IP pool, remove it manually.
 				uncache_ipmap(session[s].ip);
 		}
 
-		if (new->ip) {		// If there's a new one, add it.
+		if (new->ip)
+		{
+			// If there's a new one, add it.
 			if (new->ip_pool_index == -1)
 				routeset(s, new->ip, 0, 0, 1);
 			else
@@ -3515,7 +3673,7 @@ int load_session(sessionidt s, sessiont *new)
 		}
 	}
 
-		// Add routes for the session if they're new.
+	// 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 &&
@@ -3523,14 +3681,12 @@ int load_session(sessionidt s, sessiont *new)
 			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].route[i].ip, 0);
+			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;
@@ -3540,6 +3696,7 @@ int load_session(sessionidt s, sessiont *new)
 		// Do fixups into address pool.
 	if (new->ip_pool_index != -1)
 		fix_address_pool(s);
+
 	return 1;
 }
 
@@ -3706,9 +3863,12 @@ void processcontrol(u8 * buf, int len, struct sockaddr_in *addr)
 	int l;
 	struct param_control param = { buf, len, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), NULL, 0, 0 };
 
-	log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
-	if (log_stream)
+
+	if (log_stream && config->debug >= 4)
+	{
+		log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
 		dump_packet(buf, log_stream);
+	}
 
 	resp = calloc(1400, 1);
 	l = new_packet(PKT_RESP_ERROR, resp);
@@ -3789,7 +3949,8 @@ void become_master(void)
 	int s;
 	run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
-	for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	{
 		if (!session[s].tunnel) // Not an in-use session.
 			continue;
 
@@ -3805,10 +3966,14 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
 	int count = 0;
 	int buckets[64];
 
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
+
 	time(&time_now);
 	for (i = 0; i < 64;++i) buckets[i] = 0;
 
-	for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	{
 		int idle;
 		if (!session[s].tunnel)
 			continue;
@@ -3824,7 +3989,8 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
 		++buckets[idle];
 	}
 
-	for (i = 0; i < 63; ++i) {
+	for (i = 0; i < 63; ++i)
+	{
 		cli_print(cli, "%3d seconds  : %7.2f%% (%6d)", i * 5, (double) buckets[i] * 100.0 / count , buckets[i]);
 	}
 	cli_print(cli, "lots of secs : %7.2f%% (%6d)", (double) buckets[63] * 100.0 / count , buckets[i]);
@@ -3838,10 +4004,14 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
 	int count = 0;
 	int buckets[64];
 
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
+
 	time(&time_now);
 	for (i = 0; i < 64;++i) buckets[i] = 0;
 
-	for (s = 0; s < config->cluster_highest_sessionid ; ++s) {
+	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	{
 		int open = 0, d;
 		if (!session[s].tunnel)
 			continue;
@@ -3849,7 +4019,8 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
 		d = time_now - session[s].opened;
 		if (d < 0)
 			d = 0;
-		while (d > 1 && open < 32) {
+		while (d > 1 && open < 32)
+		{
 			++open;
 			d >>= 1; // half.
 		}
@@ -3858,10 +4029,85 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
 	}
 
 	s = 1;
-	for (i = 0; i  < 30; ++i) {
+	for (i = 0; i  < 30; ++i)
+	{
 		cli_print(cli, " < %8d seconds : %7.2f%% (%6d)", s, (double) buckets[i] * 100.0 / count , buckets[i]);
 		s <<= 1;
 	}
 	cli_print(cli, "%d total sessions open.", count);
 	return CLI_OK;
 }
+
+/* Unhide an avp.
+ *
+ * This unencodes the AVP using the L2TP CHAP secret and the
+ * previously stored random vector. It replaces the hidden data with
+ * the cleartext data and returns the length of the cleartext data
+ * (including the AVP "header" of 6 bytes).
+ *
+ * Based on code from rp-l2tpd by Roaring Penguin Software Inc.
+ */
+int unhide_avp(u8 *avp, tunnelidt t, sessionidt s, u16 length)
+{
+	MD5_CTX ctx;
+	u8 *cursor;
+	u8 digest[16];
+	u8 working_vector[16];
+	uint16_t hidden_length;
+	u8 type[2];
+	size_t done, todo;
+	u8 *output;
+
+	// Find the AVP type.
+	type[0] = *(avp + 4);
+	type[1] = *(avp + 5);
+
+	// Line up with the hidden data
+	cursor = output = avp + 6;
+
+	// Compute initial pad
+	MD5Init(&ctx);
+	MD5Update(&ctx, type, 2);
+	MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
+	MD5Update(&ctx, session[s].random_vector, session[s].random_vector_length);
+	MD5Final(digest, &ctx);
+
+	// Get hidden length
+	hidden_length = ((uint16_t) (digest[0] ^ cursor[0])) * 256 + (uint16_t) (digest[1] ^ cursor[1]);
+
+	// Keep these for later use
+	working_vector[0] = *cursor;
+	working_vector[1] = *(cursor + 1);
+	cursor += 2;
+
+	if (hidden_length > length - 8)
+	{
+		log(1, 0, s, t, "Hidden length %d too long in AVP of length %d\n", (int) hidden_length, (int) length);
+		return 0;
+	}
+
+	/* Decrypt remainder */
+	done = 2;
+	todo = hidden_length;
+	while (todo)
+	{
+		working_vector[done] = *cursor;
+		*output = digest[done] ^ *cursor;
+		++output;
+		++cursor;
+		--todo;
+		++done;
+		if (done == 16 && todo)
+		{
+			// Compute new digest
+			done = 0;
+			MD5Init(&ctx);
+			MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
+			MD5Update(&ctx, &working_vector, 16);
+			MD5Final(digest, &ctx);
+		}
+	}
+
+	return hidden_length + 6;
+}
+