X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/d4905790250059e6dd95082a1b3cc13b7c4a6c68..f8e89934339150dda8d06e5d49739c07add38761:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 39c49bf..d03ba2b 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.22 2004-08-13 00:02:50 fred_nerk Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.38 2004-11-02 06:45:03 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -63,7 +63,7 @@ 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).
 extern int cluster_sockfd;	// Intra-cluster communications socket.
-u32 last_sid = 0;		// Last used PPP SID. Can I kill this?? -- mo
+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
@@ -101,13 +101,14 @@ struct config_descriptt config_values[] = {
 	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("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),
@@ -169,6 +170,7 @@ 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);
@@ -540,18 +542,26 @@ int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc)
 
 	cli_print(cli, "%7s %s", "Sess#", "IP Address");
 
-	for (i = 0; i < 256; ++i) {
-		if (!d[i]) continue;
+	for (i = 0; i < 256; ++i)
+	{
+		if (!d[i])
+			continue;
 		e = (char**) d[i];
-		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;
 				}
 			}
@@ -573,7 +583,8 @@ sessionidt sessionbyuser(char *username)
 	int s;
 	CSTAT(call_sessionbyuser);
 
-	for (s = 1; s < MAXSESSION ; ++s) {
+	for (s = 1; s < MAXSESSION ; ++s)
+	{
 		if (session[s].walled_garden)
 			continue;		// Skip walled garden users.
 
@@ -742,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;
 		}
@@ -782,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;
 		}
@@ -808,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;
 	}
@@ -833,7 +847,8 @@ void send_ipout(sessionidt s, 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 send_ipout.\n");
 			return;
 		}
@@ -952,56 +967,48 @@ void controladd(controlt * c, tunnelidt t, sessionidt s)
 //
 // Throttle or Unthrottle a session
 //
-// Throttle the data folling through a session
-// to be no more than 'throttle' kbit/sec each way.
+// Throttle the data from/to through a session to no more than
+// 'rate_in' kbit/sec in (from user) or 'rate_out' kbit/sec out (to
+// user).
 //
-int throttle_session(sessionidt s, int throttle)
+// If either value is -1, the current value is retained for that
+// direction.
+//
+void throttle_session(sessionidt s, int rate_in, int rate_out)
 {
 	if (!session[s].tunnel)
-		return 0;	// No-one home.
+		return; // No-one home.
 
 	if (!*session[s].user)
-	        return 0; // User not logged in
-
-	if (throttle) {
-		if (session[s].tbf_in || session[s].tbf_out) {
-			if (throttle == session[s].throttle)
-				return 1;
-
-			// Currently throttled but the rate is changing.
+	        return; // User not logged in
 
+	if (rate_in >= 0)
+	{
+		int bytes = rate_in * 1024 / 8; // kbits to bytes
+		if (session[s].tbf_in)
 			free_tbf(session[s].tbf_in);
-			free_tbf(session[s].tbf_out);
-		}
-
-		session[s].tbf_in = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipin);
-		session[s].tbf_out = new_tbf(s, throttle*1024/4, throttle*1024/8, send_ipout);
 
-		if (throttle != session[s].throttle) {	// Changed. Flood to slaves.
-			session[s].throttle = throttle;
-			cluster_send_session(s);
-		}
+		if (rate_in > 0)
+			session[s].tbf_in = new_tbf(s, bytes * 2, bytes, send_ipin);
+		else
+			session[s].tbf_in = 0;
 
-		return 1;
+		session[s].throttle_in = rate_in;
 	}
 
-	// else Unthrottling.
-
-	if (!session[s].tbf_in && !session[s].tbf_out && !session[s].throttle)
-		return 0;
-
-	free_tbf(session[s].tbf_in);
-	session[s].tbf_in = 0;
+	if (rate_out >= 0)
+	{
+		int bytes = rate_out * 1024 / 8;
+		if (session[s].tbf_out)
+			free_tbf(session[s].tbf_out);
 
-	free_tbf(session[s].tbf_out);
-	session[s].tbf_out = 0;
+		if (rate_out > 0)
+			session[s].tbf_out = new_tbf(s, bytes * 2, bytes, send_ipout);
+		else
+			session[s].tbf_out = 0;
 
-	if (throttle != session[s].throttle) {	// Changed. Flood to slaves.
-		session[s].throttle = throttle;
-		cluster_send_session(s);
+		session[s].throttle_out = rate_out;
 	}
-
-	return 0;
 }
 
 // start tidy shutdown of session
@@ -1030,7 +1037,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)
 		{
@@ -1066,16 +1074,18 @@ void sessionshutdown(sessionidt s, char *reason)
 		}
 		else
 			free_ip_address(s);
-
-		if (session[s].throttle)	// Unthrottle if throttled.
-			throttle_session(s, 0);
 	}
+
+	if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
+		throttle_session(s, 0, 0);
+
 	{                            // Send CDN
 		controlt *c = controlnew(14); // sending CDN
 		control16(c, 1, 3, 1);    // result code (admin reasons - TBA make error, general error, add message
 		control16(c, 14, s, 1);   // assigned session (our end)
 		controladd(c, session[s].tunnel, s); // send the message
 	}
+
 	cluster_send_session(s);
 }
 
@@ -1105,7 +1115,8 @@ void sendipcp(tunnelidt t, sessionidt s)
 	}
 
 	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;
 	}
@@ -1133,8 +1144,6 @@ void sessionkill(sessionidt s, char *reason)
 
 	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.
-
 	memset(&session[s], 0, sizeof(session[s]));
 	session[s].tunnel = T_FREE;	// Mark it as free.
 	session[s].next = sessionfree;
@@ -1287,7 +1296,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;
 		}
@@ -1308,7 +1318,8 @@ 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) {
+			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) )
@@ -1318,7 +1329,8 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 			}
 		}
 
-		if (!t) {
+		if (!t)
+		{
 			if (!(t = new_tunnel()))
 			{
 				log(1, ntohl(addr->sin_addr.s_addr), 0, 0, "No more tunnels\n");
@@ -1425,6 +1437,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)
 				{
@@ -1457,17 +1476,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)
@@ -1535,6 +1558,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);
@@ -1780,7 +1808,7 @@ void processudp(u8 * buf, int len, struct sockaddr_in *addr)
 					// TBA
 					break;
 				case 12:      // ICCN
-					if ( amagic == 0) amagic = time_now;
+					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);
@@ -2066,7 +2094,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;
 			}
@@ -2095,16 +2124,6 @@ int regular_cleanups(void)
 				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");
@@ -2112,19 +2131,30 @@ int regular_cleanups(void)
 				session[s].snoop_port = 0;
 				send++;
 			}
-
-			if (a & CLI_SESS_THROTTLE)
+			else if (a & CLI_SESS_SNOOP)
 			{
-				log(2, 0, s, session[s].tunnel, "Throttling session by CLI (to %d)\n",
-				    cli_session_actions[s].throttle);
+				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);
 
-				throttle_session(s, cli_session_actions[s].throttle);
+				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_NOTHROTTLE)
 			{
 				log(2, 0, s, session[s].tunnel, "Un-throttling session by CLI\n");
-				throttle_session(s, 0);
+				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",
+				    cli_session_actions[s].throttle_in,
+				    cli_session_actions[s].throttle_out);
+
+				throttle_session(s, cli_session_actions[s].throttle_in, cli_session_actions[s].throttle_out);
+				send++;
 			}
 
 			if (send)
@@ -2134,7 +2164,7 @@ int regular_cleanups(void)
 		}
 	}
 
-	if (config->accounting_dir && next_acct <= TIME)
+	if (*config->accounting_dir && next_acct <= TIME)
 	{
 		// Dump accounting data
 		next_acct = TIME + ACCT_TIME;
@@ -2156,18 +2186,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 != 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_TIME 1/10th seconds
+	if (abs(TIME - start_busy_wait) > BUSY_WAIT_TIME)
+	{
+		log(1, 0, 0, 0, "Giving up waiting for RADIUS to be empty. Shutting down anyway.\n");
+		return 0;
+	}
+
 	for (i = 1; i < MAXRADIUS; i++)
 	{
 		if (radius[i].state == RADIUSNULL)
@@ -2175,7 +2218,8 @@ int still_busy(void)
 	        if (radius[i].state == RADIUSWAIT)
 			continue;
 
-		if (last_talked != 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 = TIME;
 		}
@@ -2185,11 +2229,13 @@ int still_busy(void)
 	return 0;
 }
 
+static fd_set readset;
+static int readset_n = 0;
+
 // main loop - gets packets on tun or udp and processes them
 void mainloop(void)
 {
-	fd_set cr;
-	int cn, i;
+	int i;
 	u8 buf[65536];
 	struct timeval to;
 	clockt next_cluster_ping = 0;	// send initial ping immediately
@@ -2198,29 +2244,22 @@ void mainloop(void)
 	log(4, 0, 0, 0, "Beginning of main loop. udpfd=%d, tunfd=%d, cluster_sockfd=%d, controlfd=%d\n",
 			udpfd, tunfd, cluster_sockfd, controlfd);
 
-	FD_ZERO(&cr);
-	FD_SET(udpfd, &cr);
-	FD_SET(tunfd, &cr);
-	FD_SET(controlfd, &cr);
-	FD_SET(clifd, &cr);
-	if (cluster_sockfd) FD_SET(cluster_sockfd, &cr);
-	cn = udpfd;
-	if (cn < tunfd) cn = tunfd;
-	if (cn < controlfd) cn = controlfd;
-	if (cn < clifd) cn = clifd;
-	if (cn < cluster_sockfd) cn = cluster_sockfd;
-	for (i = 0; i < config->num_radfds; i++)
-	{
-		if (!radfds[i]) continue;
-		FD_SET(radfds[i], &cr);
-		if (radfds[i] > cn)
-			cn = radfds[i];
-	}
+	FD_ZERO(&readset);
+	FD_SET(udpfd, &readset);
+	FD_SET(tunfd, &readset);
+	FD_SET(controlfd, &readset);
+	FD_SET(clifd, &readset);
+	if (cluster_sockfd) FD_SET(cluster_sockfd, &readset);
+	readset_n = udpfd;
+	if (tunfd > readset_n)          readset_n = tunfd;
+	if (controlfd > readset_n)      readset_n = controlfd;
+	if (clifd > readset_n)          readset_n = clifd;
+	if (cluster_sockfd > readset_n) readset_n = cluster_sockfd;
 
 	while (!main_quit || still_busy())
 	{
 		fd_set r;
-		int n = cn;
+		int n = readset_n;
 #ifdef BGP
 		fd_set w;
 		int bgp_set[BGP_NUM_PEERS];
@@ -2232,7 +2271,7 @@ void mainloop(void)
 			update_config();
 		}
 
-		memcpy(&r, &cr, sizeof(fd_set));
+		memcpy(&r, &readset, sizeof(fd_set));
 		to.tv_sec = 0;
 		to.tv_usec = 100000; // 1/10th of a second.
 
@@ -2264,7 +2303,8 @@ void mainloop(void)
 		TIME = now();
 		if (n < 0)
 		{
-			if (errno == EINTR)
+			if (errno == EINTR ||
+			    errno == ECHILD) // EINTR was clobbered by sigchild_handler()
 				continue;
 
 			log(0, 0, 0, 0, "Error returned from select(): %s\n", strerror(errno));
@@ -2297,16 +2337,22 @@ void mainloop(void)
 						break;
 				}
 			}
-			for (i = 0; i < config->num_radfds; i++)
-				if (FD_ISSET(radfds[i], &r))
-					processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
-			if (FD_ISSET(cluster_sockfd, &r)) {
+
+			if (config->cluster_iam_master)
+				for (i = 0; i < config->num_radfds; i++)
+					if (FD_ISSET(radfds[i], &r))
+						processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
+
+			if (FD_ISSET(cluster_sockfd, &r))
+			{
 				int size;
 				size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
 				processcluster(buf, size, addr.sin_addr.s_addr);
 			}
+
 			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;
@@ -2350,7 +2396,8 @@ void mainloop(void)
 			// Runs on all machines both master and slave.
 		{
 			static clockt last_run = 0;
-			if (last_run != TIME) {
+			if (last_run != TIME)
+			{
 				last_run = TIME;
 				tbf_run_timer();
 			}
@@ -2360,10 +2407,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.
 			}
 		}
@@ -2391,78 +2443,75 @@ 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 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
-	ringbuffer = mmap(NULL, sizeof(struct Tringbuffer), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (ringbuffer == MAP_FAILED)
+	if (!(ringbuffer = shared_malloc(sizeof(struct Tringbuffer))))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for ringbuffer: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for ringbuffer: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(ringbuffer, 0, sizeof(struct Tringbuffer));
 #endif
 
-	cli_session_actions = mmap(NULL, sizeof(struct cli_session_actions) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (cli_session_actions == MAP_FAILED)
+	if (!(cli_session_actions = shared_malloc(sizeof(struct cli_session_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for cli session actions: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for cli session actions: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(cli_session_actions, 0, sizeof(struct cli_session_actions) * MAXSESSION);
-	cli_tunnel_actions = mmap(NULL, sizeof(struct cli_tunnel_actions) * MAXSESSION, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (cli_tunnel_actions == MAP_FAILED)
+
+	if (!(cli_tunnel_actions = shared_malloc(sizeof(struct cli_tunnel_actions) * MAXSESSION)))
 	{
-		log(0, 0, 0, 0, "Error doing mmap for cli tunnel actions: %s\n", strerror(errno));
+		log(0, 0, 0, 0, "Error doing malloc for cli tunnel actions: %s\n", strerror(errno));
 		exit(1);
 	}
 	memset(cli_tunnel_actions, 0, sizeof(struct cli_tunnel_actions) * MAXSESSION);
@@ -2473,7 +2522,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.
 	}
@@ -2481,9 +2531,8 @@ 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)
 	{
@@ -2492,13 +2541,13 @@ void initdata(void)
 		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 */
@@ -2605,7 +2654,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)
@@ -2614,13 +2664,16 @@ 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;
 
@@ -2631,7 +2684,8 @@ void rebuild_address_pool(void)
 		}
 
 
-		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;
@@ -2786,7 +2840,6 @@ void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port)
 }
 
 void dump_acct_info()
-
 {
 	char filename[1024];
 	char timestr[64];
@@ -2802,7 +2855,7 @@ void dump_acct_info()
 
 	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)
+		if (!session[i].opened || !session[i].ip || !(session[i].cin || session[i].cout) || !*session[i].user || session[i].walled_garden)
 			continue;
 		if (!f)
 		{
@@ -2825,11 +2878,11 @@ void dump_acct_info()
 
 		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].user,						// username
+		        inet_toa(htonl(session[i].ip)),					// ip
+		        (session[i].throttle_in || session[i].throttle_out) ? 2 : 1,	// qos
+		        (u32)session[i].cin,						// uptxoctets
+		        (u32)session[i].cout);						// downrxoctets
 
 		session[i].pin = session[i].cin = 0;
 		session[i].pout = session[i].cout = 0;
@@ -2844,13 +2897,14 @@ 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)
 		{
@@ -2862,10 +2916,12 @@ int main(int argc, char *argv[])
 			case 'v':
 				optdebug++;
 				break;
+			case 'c':
+			    	optconfig = optarg;
+				break;
 			case 'h':
 				snprintf(hostname, sizeof(hostname), "%s", optarg);
 				break;
-			case '?':
 			default:
 				printf("Args are:\n"
 				       "\t-d\tDetach from terminal\n"
@@ -2887,13 +2943,11 @@ int main(int argc, char *argv[])
 
 	initiptables();
 	initplugins();
-	initdata();
-
-	config->debug = optdebug;
+	initdata(optdebug, optconfig);
 
-	init_tbf();
 	init_cli(hostname);
 	read_config_file();
+	init_tbf(config->num_tbfs);
 
 	log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
 	log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
@@ -3441,7 +3495,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;
 	}
@@ -3463,7 +3518,6 @@ int sessionsetup(tunnelidt t, sessionidt s)
 
 	CSTAT(call_sessionsetup);
 
-
 	log(3, session[s].ip, s, t, "Doing session setup for session\n");
 
 	if (!session[s].ip || session[s].ip == 0xFFFFFFFE)
@@ -3473,7 +3527,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;
+		}
 	}
 
 
@@ -3508,12 +3566,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)
+	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.
@@ -3522,10 +3580,9 @@ int sessionsetup(tunnelidt t, sessionidt s)
 		run_plugins(PLUGIN_NEW_SESSION, &data);
 	}
 
-	// Force throttling on or off (Actually : refresh the current throttling status)
-	// This has the advantage of cleaning up after another throttled user who may have left
-	// firewall rules lying around
-	throttle_session(s, session[s].throttle);
+	// Allocate TBFs if throttled
+	if (session[s].throttle_in || session[s].throttle_out)
+		throttle_session(s, session[s].throttle_in, session[s].throttle_out);
 
 	session[s].last_packet = time_now;
 
@@ -3554,7 +3611,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;
@@ -3585,7 +3643,9 @@ int load_session(sessionidt s, sessiont *new)
 				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
@@ -3611,6 +3671,12 @@ int load_session(sessionidt s, sessiont *new)
 					// for walking the sessions to forward byte counts to the master.
 		config->cluster_highest_sessionid = s;
 
+	// TEMP: old session struct used a u32 to define the throttle
+	// speed for both up/down, new uses a u16 for each.  Deal with
+	// sessions from an old master for migration.
+	if (new->throttle_out == 0 && new->tbf_out)
+		new->throttle_out = new->throttle_in;
+
 	memcpy(&session[s], new, sizeof(session[s]));	// Copy over..
 
 		// Do fixups into address pool.
@@ -3866,18 +3932,33 @@ tunnelidt new_tunnel()
 //
 void become_master(void)
 {
-	int s;
+	int s, i;
 	run_plugins(PLUGIN_BECOME_MASTER, NULL);
 
-	for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
-		if (!session[s].tunnel) // Not an in-use session.
-			continue;
+	// running a bunch of iptables commands is slow and can cause
+	// the master to drop tunnels on takeover--kludge around the
+	// problem by forking for the moment (note: race)
+	if (!fork_and_close())
+	{
+		for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+		{
+			if (!session[s].tunnel) // Not an in-use session.
+				continue;
 
-		run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+			run_plugins(PLUGIN_NEW_SESSION_MASTER, &session[s]);
+		}
+		exit(0);
 	}
-}
-
 
+	// add radius fds
+	for (i = 0; i < config->num_radfds; i++)
+	{
+		if (!radfds[i]) continue;
+		FD_SET(radfds[i], &readset);
+		if (radfds[i] > readset_n)
+			readset_n = radfds[i];
+	}
+}
 
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc)
 {
@@ -3891,7 +3972,8 @@ int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc
 	time(&time_now);
 	for (i = 0; i < 64;++i) buckets[i] = 0;
 
-	for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
+	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	{
 		int idle;
 		if (!session[s].tunnel)
 			continue;
@@ -3907,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]);
@@ -3927,7 +4010,8 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
 	time(&time_now);
 	for (i = 0; i < 64;++i) buckets[i] = 0;
 
-	for (s = 1; s <= config->cluster_highest_sessionid ; ++s) {
+	for (s = 1; s <= config->cluster_highest_sessionid ; ++s)
+	{
 		int open = 0, d;
 		if (!session[s].tunnel)
 			continue;
@@ -3935,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.
 		}
@@ -3944,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;
+}
+