X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/9cb7003d3390c34d3f01bb10fe5542d433ae99de..b5273cc1c65f9496c1a7c2135b61979dd98fcf08:/cli.c?ds=sidebyside

diff --git a/cli.c b/cli.c
index e90b2a6..65afb43 100644
--- a/cli.c
+++ b/cli.c
@@ -1,10 +1,8 @@
 // L2TPNS Command Line Interface
 // vim: sw=8 ts=8
 
-char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.44 2004/12/18 01:20:05 bodea Exp $";
-
 #include <stdio.h>
+#include <stddef.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/file.h>
@@ -23,8 +21,10 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.44 2004/12/18 01:20:05 bodea Exp $";
 #include <dlfcn.h>
 #include <netdb.h>
 #include <libcli.h>
+#include <linux/rtnetlink.h>
 
 #include "l2tpns.h"
+#include "constants.h"
 #include "util.h"
 #include "cluster.h"
 #include "tbf.h"
@@ -32,8 +32,12 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.44 2004/12/18 01:20:05 bodea Exp $";
 #ifdef BGP
 #include "bgp.h"
 #endif
+#ifdef LAC
+#include "l2tplac.h"
+#endif
 
 extern tunnelt *tunnel;
+extern bundlet *bundle;
 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;
@@ -49,15 +53,6 @@ extern struct cli_tunnel_actions *cli_tunnel_actions;
 extern tbft *filter_list;
 extern ip_filtert *ip_filters;
 
-static char *debug_levels[] = {
-	"CRIT",
-	"ERROR",
-	"WARN",
-	"INFO",
-	"CALL",
-	"DATA",
-};
-
 struct
 {
 	char critical;
@@ -68,15 +63,24 @@ struct
 	char data;
 } debug_flags;
 
-static int debug_session;
-static int debug_tunnel;
+#ifdef RINGBUFFER
+
 static int debug_rb_tail;
+static char *debug_levels[] = {
+	"CRIT",
+	"ERROR",
+	"WARN",
+	"INFO",
+	"CALL",
+	"DATA",
+};
+
+#endif
 
 static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc);
@@ -84,7 +88,6 @@ static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int
 static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc);
@@ -98,9 +101,19 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc);
+#ifdef LAC
+static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc);
+#endif
 
 static int regular_stuff(struct cli_def *cli);
-static void parsemac(char *string, char mac[6]);
+
+#ifdef STATISTICS
+static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc);
+#endif /* STATISTICS */
 
 #ifdef BGP
 #define MODE_CONFIG_BGP 8
@@ -124,20 +137,14 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 /* match if b is a substr of a */
 #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
 
-void init_cli(char *hostname)
+void init_cli()
 {
 	FILE *f;
 	char buf[4096];
 	struct cli_command *c;
 	struct cli_command *c2;
-	int on = 1;
-	struct sockaddr_in addr;
 
 	cli = cli_init();
-	if (hostname && *hostname)
-		cli_set_hostname(cli, hostname);
-	else
-		cli_set_hostname(cli, "l2tpns");
 
 	c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
 	cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana");
@@ -149,7 +156,10 @@ void init_cli(char *hostname)
 	cli_register_command(cli, c, "plugins", cmd_show_plugins, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all installed plugins");
 	cli_register_command(cli, c, "pool", cmd_show_pool, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the IP address allocation pool");
 	cli_register_command(cli, c, "radius", cmd_show_radius, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show active radius queries");
-	cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the currently running configuration");
+	cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show the currently running configuration");
+#ifdef LAC
+	cli_register_command(cli, c, "remotelns-conf", cmd_show_rmtlnsconf, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show a list of remote LNS configuration");
+#endif
 	cli_register_command(cli, c, "session", cmd_show_session, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of sessions or details for a single session");
 	cli_register_command(cli, c, "tbf", cmd_show_tbf, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all token bucket filters in use");
 	cli_register_command(cli, c, "throttle", cmd_show_throttle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all throttled sessions and associated TBFs");
@@ -170,6 +180,8 @@ void init_cli(char *hostname)
 #endif
 
 	cli_register_command(cli, NULL, "uptime", cmd_uptime, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show uptime and bandwidth utilisation");
+	cli_register_command(cli, NULL, "shutdown", cmd_shutdown, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Shutdown l2tpns daemon and exit");
+	cli_register_command(cli, NULL, "reload", cmd_reload, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Reload configuration");
 
 	c = cli_register_command(cli, NULL, "write", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
 	cli_register_command(cli, c, "memory", cmd_write_memory, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Save the running config to flash");
@@ -220,6 +232,10 @@ void init_cli(char *hostname)
 
 	cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set a configuration variable");
 
+#ifdef LAC
+	cli_register_command(cli, NULL, "setforward", cmd_setforward, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set the Remote LNS Forward");
+#endif
+
 	c = cli_register_command(cli, NULL, "ip", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG, NULL);
 	cli_register_command(cli, c, "access-list", cmd_ip_access_list, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Add named access-list");
 
@@ -261,9 +277,20 @@ void init_cli(char *hostname)
 		}
 		fclose(f);
 	}
+}
+
+void cli_init_complete(char *hostname)
+{
+	int on = 1;
+	struct sockaddr_in addr;
+
+	if (hostname && *hostname)
+		cli_set_hostname(cli, hostname);
+	else
+		cli_set_hostname(cli, "l2tpns");
 
 	memset(&addr, 0, sizeof(addr));
-	clifd = socket(PF_INET, SOCK_STREAM, 6);
+	clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 	{
 		int flags;
@@ -272,26 +299,36 @@ void init_cli(char *hostname)
 		fcntl(clifd, F_SETFL, flags | O_NONBLOCK);
 	}
 	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = config->cli_bind_address; /* defaults to INADDR_ANY */
 	addr.sin_port = htons(23);
 	if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
+	{
+		LOG(0, 0, 0, "Error binding cli on port 23: %s\n", strerror(errno));
+		close(clifd);
+		clifd = -1;
+		return;
+	}
+	if (listen(clifd, 10) < 0)
 	{
 		LOG(0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
+		close(clifd);
+		clifd = -1;
 		return;
 	}
-	listen(clifd, 10);
 }
 
 void cli_do(int sockfd)
 {
 	int require_auth = 1;
 	struct sockaddr_in addr;
-	int l = sizeof(addr);
+	socklen_t l = sizeof(addr);
 
 	if (fork_and_close()) return;
-	if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
+	if (getpeername(sockfd, (struct sockaddr *) &addr, &l) == 0)
 	{
-		LOG(3, 0, 0, "Accepted connection to CLI from %s\n", fmtaddr(addr.sin_addr.s_addr, 0));
 		require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
+		LOG(require_auth ? 3 : 4, 0, 0, "Accepted connection to CLI from %s\n",
+			fmtaddr(addr.sin_addr.s_addr, 0));
 	}
 	else
 		LOG(0, 0, 0, "getpeername() failed on cli socket.  Requiring authentication: %s\n", strerror(errno));
@@ -311,8 +348,6 @@ void cli_do(int sockfd)
 		cli->users = 0;
 	}
 
-	debug_session = 0;
-	debug_tunnel = 0;
 #ifdef RINGBUFFER
 	debug_rb_tail = ringbuffer->tail;
 #endif
@@ -322,7 +357,9 @@ void cli_do(int sockfd)
 	cli_loop(cli, sockfd);
 
 	close(sockfd);
-	LOG(3, 0, 0, "Closed CLI connection from %s\n", fmtaddr(addr.sin_addr.s_addr, 0));
+	LOG(require_auth ? 3 : 4, 0, 0, "Closed CLI connection from %s\n",
+		fmtaddr(addr.sin_addr.s_addr, 0));
+
 	exit(0);
 }
 
@@ -361,16 +398,16 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...)
 
 		desc = va_arg(ap, char *);
 		if (desc && *desc)
-			cli_print(cli, "  %-20s %s", p, desc);
+			cli_error(cli, "  %-20s %s", p, desc);
 		else
-			cli_print(cli, "  %s", p);
+			cli_error(cli, "  %s", p);
 
 		entry = desc ? va_arg(ap, char *) : 0;
 	}
 
 	va_end(ap);
 	if (cr_ok)
-		cli_print(cli, "  <cr>");
+		cli_error(cli, "  <cr>");
 
 	return CLI_OK;
 }
@@ -402,15 +439,46 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			cli_print(cli, "\tCalling Num:\t%s", session[s].calling);
 			cli_print(cli, "\tCalled Num:\t%s", session[s].called);
 			cli_print(cli, "\tTunnel ID:\t%d", session[s].tunnel);
+			cli_print(cli, "\tPPP Phase:\t%s", ppp_phase(session[s].ppp.phase));
+			switch (session[s].ppp.phase)
+			{
+			case Establish:
+				cli_print(cli, "\t LCP state:\t%s", ppp_state(session[s].ppp.lcp));
+				break;
+
+			case Authenticate:
+			case Network:
+				cli_print(cli, "\t IPCP state:\t%s", ppp_state(session[s].ppp.ipcp));
+				cli_print(cli, "\t IPV6CP state:\t%s", ppp_state(session[s].ppp.ipv6cp));
+				cli_print(cli, "\t CCP state:\t%s", ppp_state(session[s].ppp.ccp));
+			}
 			cli_print(cli, "\tIP address:\t%s", fmtaddr(htonl(session[s].ip), 0));
-			cli_print(cli, "\tUnique SID:\t%lu", session[s].unique_id);
-			cli_print(cli, "\tIdle time:\t%u seconds", abs(time_now - session[s].last_packet));
-			cli_print(cli, "\tNext Recv:\t%u", session[s].nr);
-			cli_print(cli, "\tNext Send:\t%u", session[s].ns);
-			cli_print(cli, "\tBytes In/Out:\t%u/%u", session[s].total_cout, session[s].total_cin);
+			cli_print(cli, "\tUnique SID:\t%u", session[s].unique_id);
+			cli_print(cli, "\tOpened:\t\t%u seconds", session[s].opened ? abs(time_now - session[s].opened) : 0);
+			cli_print(cli, "\tIdle time:\t%u seconds", session[s].last_packet ? abs(time_now - session[s].last_packet) : 0);
+			if (session[s].session_timeout)
+			{
+			    	clockt opened = session[s].opened;
+				if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
+					opened = bundle[session[s].bundle].online_time;
+
+				cli_print(cli, "\tSess Timeout:\t%u seconds", session[s].session_timeout - (opened ? abs(time_now - opened) : 0));
+			}
+
+			if (session[s].idle_timeout)
+				cli_print(cli, "\tIdle Timeout:\t%u seconds", session[s].idle_timeout - (session[s].last_data ? abs(time_now - session[s].last_data) : 0));
+
+			if (session[s].timeout)
+			{
+				cli_print(cli, "\tRemaining time:\t%u",
+					(session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
+					? (unsigned) (session[s].timeout - bundle[session[s].bundle].online_time)
+					: (unsigned) (session[s].timeout - (time_now - session[s].opened)));
+			}
+
+			cli_print(cli, "\tBytes In/Out:\t%u/%u", session[s].cout, session[s].cin);
 			cli_print(cli, "\tPkts In/Out:\t%u/%u", session[s].pout, session[s].pin);
 			cli_print(cli, "\tMRU:\t\t%d", session[s].mru);
-			cli_print(cli, "\tRadius Session:\t%u", session[s].radius);
 			cli_print(cli, "\tRx Speed:\t%u", session[s].rx_connect_speed);
 			cli_print(cli, "\tTx Speed:\t%u", session[s].tx_connect_speed);
 			if (session[s].filter_in && session[s].filter_in <= MAXFILTER)
@@ -475,37 +543,69 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 	}
 
 	// Show Summary
-	cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",
+#ifdef LAC
+	cli_print(cli, "%5s %7s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-18s %s",
+#else
+	cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-15s %s",
+#endif
 			"SID",
+#ifdef LAC
+			"LkToSID",
+#endif
 			"TID",
 			"Username",
 			"IP",
 			"I",
 			"T",
 			"G",
+			"6",
 			"opened",
 			"downloaded",
 			"uploaded",
 			"idle",
-			"LAC",
+			"Rem.Time",
+#ifdef LAC
+			"LAC(L)/RLNS(R)/PPPOE(P)",
+#else
+			"LAC(L)/PPPOE(P)",
+#endif
 			"CLI");
 
 	for (i = 1; i < MAXSESSION; i++)
 	{
+		uint32_t rem_time;
 		if (!session[i].opened) continue;
-		cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %10u %10lu %10lu %4u %-15s %s",
+		if (session[i].bundle && bundle[session[i].bundle].num_of_links > 1)
+			rem_time = session[i].timeout ? (session[i].timeout - bundle[session[i].bundle].online_time) : 0;
+		else
+			rem_time = session[i].timeout ? (session[i].timeout - (time_now-session[i].opened)) : 0;
+#ifdef LAC
+		cli_print(cli, "%5d %7d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
+#else
+		cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
+#endif
 				i,
+#ifdef LAC
+				session[i].forwardtosession,
+#endif
 				session[i].tunnel,
 				session[i].user[0] ? session[i].user : "*",
 				fmtaddr(htonl(session[i].ip), 0),
 				(session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",
 				(session[i].throttle_in || session[i].throttle_out) ? "Y" : "N",
 				(session[i].walled_garden) ? "Y" : "N",
+				(session[i].ppp.ipv6cp == Opened) ? "Y" : "N",
 				abs(time_now - (unsigned long)session[i].opened),
-				(unsigned long)session[i].total_cout,
-				(unsigned long)session[i].total_cin,
+				(unsigned long)session[i].cout,
+				(unsigned long)session[i].cin,
 				abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
-				fmtaddr(htonl(tunnel[ session[i].tunnel ].ip), 1),
+				(unsigned long)(rem_time),
+#ifdef LAC
+				(session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":(tunnel[session[i].tunnel].isremotelns?"(R)":"(L)"),
+#else
+				(session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":"(L)",
+#endif
+				(session[i].tunnel == TUNNEL_ID_PPPOE)?fmtMacAddr(session[i].src_hwaddr):fmtaddr(htonl(tunnel[session[i].tunnel].ip), 1),
 				session[i].calling[0] ? session[i].calling : "*");
 	}
 	return CLI_OK;
@@ -589,12 +689,18 @@ static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int
 		if (!show_all && (!tunnel[i].ip || tunnel[i].die)) continue;
 
 		for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;
-		cli_print(cli, "%4d %20s %20s %6s %6d",
+		cli_print(cli, "%4d %20s %20s %6s %6d %s",
 				i,
 				*tunnel[i].hostname ? tunnel[i].hostname : "(null)",
 				fmtaddr(htonl(tunnel[i].ip), 0),
 				states[tunnel[i].state],
-				sessions);
+				sessions
+#ifdef LAC
+				,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":(tunnel[i].isremotelns?"Tunnel To Remote LNS":"Tunnel To LAC")
+#else
+				,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":"Tunnel To LAC"
+#endif
+				);
 	}
 
 	return CLI_OK;
@@ -641,28 +747,30 @@ static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int a
 	return CLI_OK;
 }
 
+#ifdef STATISTICS
 static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
 
-	cli_print(cli, "%-10s %-8s %-10s %-8s", "Ethernet", "Bytes", "Packets", "Errors");
-	cli_print(cli, "%-10s %8u %8u %8u", "RX",
+	cli_print(cli, "%-10s %10s %10s %10s %10s", "Ethernet", "Bytes", "Packets", "Errors", "Dropped");
+	cli_print(cli, "%-10s %10u %10u %10u %10u", "RX",
 			GET_STAT(tun_rx_bytes),
 			GET_STAT(tun_rx_packets),
-			GET_STAT(tun_rx_errors));
-	cli_print(cli, "%-10s %8u %8u %8u", "TX",
+			GET_STAT(tun_rx_errors),
+			GET_STAT(tun_rx_dropped));
+	cli_print(cli, "%-10s %10u %10u %10u", "TX",
 			GET_STAT(tun_tx_bytes),
 			GET_STAT(tun_tx_packets),
 			GET_STAT(tun_tx_errors));
 	cli_print(cli, "");
 
-	cli_print(cli, "%-10s %-8s %-10s %-8s %-8s", "Tunnel", "Bytes", "Packets", "Errors", "Retries");
-	cli_print(cli, "%-10s %8u %8u %8u", "RX",
+	cli_print(cli, "%-10s %10s %10s %10s %10s", "Tunnel", "Bytes", "Packets", "Errors", "Retries");
+	cli_print(cli, "%-10s %10u %10u %10u", "RX",
 			GET_STAT(tunnel_rx_bytes),
 			GET_STAT(tunnel_rx_packets),
 			GET_STAT(tunnel_rx_errors));
-	cli_print(cli, "%-10s %8u %8u %8u %8u", "TX",
+	cli_print(cli, "%-10s %10u %10u %10u %10u", "TX",
 			GET_STAT(tunnel_tx_bytes),
 			GET_STAT(tunnel_tx_packets),
 			GET_STAT(tunnel_tx_errors),
@@ -691,23 +799,27 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 	cli_print(cli, "%-30s%u", "multi_read_exceeded",	GET_STAT(multi_read_exceeded));
 
 
-#ifdef STATISTICS
+#ifdef STAT_CALLS
 	cli_print(cli, "\n%-30s%-10s", "Counter", "Value");
 	cli_print(cli, "-----------------------------------------");
 	cli_print(cli, "%-30s%u", "call_processtun",		GET_STAT(call_processtun));
 	cli_print(cli, "%-30s%u", "call_processipout",		GET_STAT(call_processipout));
+	cli_print(cli, "%-30s%u", "call_processipv6out",	GET_STAT(call_processipv6out));
 	cli_print(cli, "%-30s%u", "call_processudp",		GET_STAT(call_processudp));
 	cli_print(cli, "%-30s%u", "call_processpap",		GET_STAT(call_processpap));
 	cli_print(cli, "%-30s%u", "call_processchap",		GET_STAT(call_processchap));
 	cli_print(cli, "%-30s%u", "call_processlcp",		GET_STAT(call_processlcp));
 	cli_print(cli, "%-30s%u", "call_processipcp",		GET_STAT(call_processipcp));
+	cli_print(cli, "%-30s%u", "call_processipv6cp",		GET_STAT(call_processipv6cp));
 	cli_print(cli, "%-30s%u", "call_processipin",		GET_STAT(call_processipin));
+	cli_print(cli, "%-30s%u", "call_processipv6in",		GET_STAT(call_processipv6in));
 	cli_print(cli, "%-30s%u", "call_processccp",		GET_STAT(call_processccp));
 	cli_print(cli, "%-30s%u", "call_processrad",		GET_STAT(call_processrad));
 	cli_print(cli, "%-30s%u", "call_sendarp",		GET_STAT(call_sendarp));
 	cli_print(cli, "%-30s%u", "call_sendipcp",		GET_STAT(call_sendipcp));
 	cli_print(cli, "%-30s%u", "call_sendchap",		GET_STAT(call_sendchap));
 	cli_print(cli, "%-30s%u", "call_sessionbyip",		GET_STAT(call_sessionbyip));
+	cli_print(cli, "%-30s%u", "call_sessionbyipv6",		GET_STAT(call_sessionbyipv6));
 	cli_print(cli, "%-30s%u", "call_sessionbyuser",		GET_STAT(call_sessionbyuser));
 	cli_print(cli, "%-30s%u", "call_tunnelsend",		GET_STAT(call_tunnelsend));
 	cli_print(cli, "%-30s%u", "call_tunnelkill",		GET_STAT(call_tunnelkill));
@@ -720,79 +832,41 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 	cli_print(cli, "%-30s%u", "call_dump_acct_info",	GET_STAT(call_dump_acct_info));
 	cli_print(cli, "%-30s%u", "call_radiussend",		GET_STAT(call_radiussend));
 	cli_print(cli, "%-30s%u", "call_radiusretry",		GET_STAT(call_radiusretry));
-#endif
+	cli_print(cli, "%-30s%u", "call_random_data",		GET_STAT(call_random_data));
+#endif /* STAT_CALLS */
+
+	{
+		time_t l = GET_STAT(last_reset);
+		char *t = ctime(&l);
+		char *p = strchr(t, '\n');
+		if (p) *p = 0;
+
+		cli_print(cli, "");
+		cli_print(cli, "Last counter reset %s", t);
+	}
+
 	return CLI_OK;
 }
 
-static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)
 {
-	int tag = 0;
-	int file = 0;
-	int i = 0;
-
 	if (CLI_HELP_REQUESTED)
-		return cli_arg_help(cli, 1,
-			"tag", "Include CVS release tag",
-			"file", "Include file versions",
-			NULL);
-
-	for (i = 0; i < argc; i++)
-		if (!strcmp(argv[i], "tag"))
-			tag++;
-		else if (!strcmp(argv[i], "file"))
-			file++;
-
-	cli_print(cli, "L2TPNS %s", VERSION);
-	if (tag)
-	{
-		char const *p = strchr(cvs_name, ':');
-		char const *e;
-		if (p)
-		{
-			p++;
-			while (isspace(*p))
-				p++;
-		}
-
-		if (!p || *p == '$')
-			p = "HEAD";
+		return CLI_HELP_NO_ARGS;
 
-		e = strpbrk(p, " \t$");
-		cli_print(cli, "Tag: %.*s", (int) (e ? e - p + 1 : strlen(p)), p);
-	}
-	
-	if (file)
-	{
-		extern linked_list *loaded_plugins;
-		void *p;
+	memset(_statistics, 0, sizeof(struct Tstats));
+	SET_STAT(last_reset, time(NULL));
 
-		cli_print(cli, "Files:");
-		cli_print(cli, "  %s", cvs_id_arp);
-#ifdef BGP
-		cli_print(cli, "  %s", cvs_id_bgp);
-#endif /* BGP */
-		cli_print(cli, "  %s", cvs_id_cli);
-		cli_print(cli, "  %s", cvs_id_cluster);
-		cli_print(cli, "  %s", cvs_id_constants);
-		cli_print(cli, "  %s", cvs_id_control);
-		cli_print(cli, "  %s", cvs_id_icmp);
-		cli_print(cli, "  %s", cvs_id_l2tpns);
-		cli_print(cli, "  %s", cvs_id_ll);
-		cli_print(cli, "  %s", cvs_id_md5);
-		cli_print(cli, "  %s", cvs_id_ppp);
-		cli_print(cli, "  %s", cvs_id_radius);
-		cli_print(cli, "  %s", cvs_id_tbf);
-		cli_print(cli, "  %s", cvs_id_util);
+	cli_print(cli, "Counters cleared");
+	return CLI_OK;
+}
+#endif /* STATISTICS */
 
-		ll_reset(loaded_plugins);
-		while ((p = ll_next(loaded_plugins)))
-		{
-			char const **id = dlsym(p, "cvs_id");
-			if (id)
-				cli_print(cli, "  %s", *id);
-		}
-	}
+static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
 
+	cli_print(cli, "L2TPNS %s", VERSION);
 	return CLI_OK;
 }
 
@@ -880,7 +954,7 @@ static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int
 	}
 	else
 	{
-		cli_print(cli, "Error writing configuration: %s", strerror(errno));
+		cli_error(cli, "Error writing configuration: %s", strerror(errno));
 	}
 	return CLI_OK;
 }
@@ -914,14 +988,6 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
 			cli_print(cli, "set %s %d", config_values[i].key, *(int *) value);
 		else if (config_values[i].type == UNSIGNED_LONG)
 			cli_print(cli, "set %s %lu", config_values[i].key, *(unsigned long *) value);
-		else if (config_values[i].type == MAC)
-			cli_print(cli, "set %s %02x%02x.%02x%02x.%02x%02x", config_values[i].key,
-					*(unsigned short *) (value + 0),
-					*(unsigned short *) (value + 1),
-					*(unsigned short *) (value + 2),
-					*(unsigned short *) (value + 3),
-					*(unsigned short *) (value + 4),
-					*(unsigned short *) (value + 5));
 	}
 
 	cli_print(cli, "# Plugins");
@@ -963,6 +1029,11 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
 				h = BGP_HOLD_TIME;
 
 			cli_print(cli, " neighbour %s timers %d %d", config->neighbour[i].name, k, h);
+
+			if (config->neighbour[i].update_source.s_addr != INADDR_ANY)
+				cli_print(cli, " neighbour %s update-source %s",
+						config->neighbour[i].name,
+						inet_ntoa(config->neighbour[i].update_source));
 		}
 	}
 #endif
@@ -997,6 +1068,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int
 		"IPCP",
 		"START",
 		"STOP",
+		"INTRM",
 		"WAIT",
 	};
 
@@ -1111,16 +1183,6 @@ static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)
-{
-	if (CLI_HELP_REQUESTED)
-		return CLI_HELP_NO_ARGS;
-
-	cli_print(cli, "Counters cleared");
-	SET_STAT(last_reset, time(NULL));
-	return CLI_OK;
-}
-
 static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	int i;
@@ -1132,7 +1194,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1140,7 +1202,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a user to drop");
+		cli_error(cli, "Specify a user to drop");
 		return CLI_OK;
 	}
 
@@ -1148,7 +1210,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar
 	{
 		if (!(s = sessionbyuser(argv[i])))
 		{
-			cli_print(cli, "User %s is not connected", argv[i]);
+			cli_error(cli, "User %s is not connected", argv[i]);
 			continue;
 		}
 
@@ -1173,7 +1235,7 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1181,7 +1243,7 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a tunnel to drop");
+		cli_error(cli, "Specify a tunnel to drop");
 		return CLI_OK;
 	}
 
@@ -1189,19 +1251,19 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int
 	{
 		if ((t = atol(argv[i])) <= 0 || (t >= MAXTUNNEL))
 		{
-			cli_print(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1);
+			cli_error(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1);
 			continue;
 		}
 
 		if (!tunnel[t].ip)
 		{
-			cli_print(cli, "Tunnel %d is not connected", t);
+			cli_error(cli, "Tunnel %d is not connected", t);
 			continue;
 		}
 
 		if (tunnel[t].die)
 		{
-			cli_print(cli, "Tunnel %d is already being shut down", t);
+			cli_error(cli, "Tunnel %d is already being shut down", t);
 			continue;
 		}
 
@@ -1223,7 +1285,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1231,7 +1293,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a session id to drop");
+		cli_error(cli, "Specify a session id to drop");
 		return CLI_OK;
 	}
 
@@ -1239,7 +1301,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 	{
 		if ((s = atol(argv[i])) <= 0 || (s > MAXSESSION))
 		{
-			cli_print(cli, "Invalid session ID (1-%d)", MAXSESSION-1);
+			cli_error(cli, "Invalid session ID (1-%d)", MAXSESSION-1);
 			continue;
 		}
 
@@ -1248,9 +1310,16 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 			cli_print(cli, "Dropping session %d", s);
 			cli_session_actions[s].action |= CLI_SESS_KILL;
 		}
+#ifdef LAC
+		else if (session[s].forwardtosession && session[s].opened && !session[s].die)
+		{
+			cli_print(cli, "Dropping session %d", s);
+			cli_session_actions[s].action |= CLI_SESS_KILL;
+		}
+#endif
 		else
 		{
-			cli_print(cli, "Session %d is not active.", s);
+			cli_error(cli, "Session %d is not active.", s);
 		}
 	}
 
@@ -1290,7 +1359,7 @@ static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1298,27 +1367,27 @@ static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (argc < 3)
 	{
-		cli_print(cli, "Specify username, ip and port");
+		cli_error(cli, "Specify username, ip and port");
 		return CLI_OK;
 	}
 
 	if (!(s = sessionbyuser(argv[0])))
 	{
-		cli_print(cli, "User %s is not connected", argv[0]);
+		cli_error(cli, "User %s is not connected", argv[0]);
 		return CLI_OK;
 	}
 
 	ip = inet_addr(argv[1]);
 	if (!ip || ip == INADDR_NONE)
 	{
-		cli_print(cli, "Cannot parse IP \"%s\"", argv[1]);
+		cli_error(cli, "Cannot parse IP \"%s\"", argv[1]);
 		return CLI_OK;
 	}
 
 	port = atoi(argv[2]);
 	if (!port)
 	{
-		cli_print(cli, "Invalid port %s", argv[2]);
+		cli_error(cli, "Invalid port %s", argv[2]);
 		return CLI_OK;
 	}
 
@@ -1341,7 +1410,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1349,7 +1418,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a user to unsnoop");
+		cli_error(cli, "Specify a user to unsnoop");
 		return CLI_OK;
 	}
 
@@ -1357,7 +1426,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg
 	{
 		if (!(s = sessionbyuser(argv[i])))
 		{
-			cli_print(cli, "User %s is not connected", argv[i]);
+			cli_error(cli, "User %s is not connected", argv[i]);
 			continue;
 		}
 
@@ -1415,7 +1484,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1423,13 +1492,13 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 
 	if (argc == 0)
 	{
-		cli_print(cli, "Specify a user to throttle");
+		cli_error(cli, "Specify a user to throttle");
 		return CLI_OK;
 	}
 
 	if (!(s = sessionbyuser(argv[0])))
 	{
-		cli_print(cli, "User %s is not connected", argv[0]);
+		cli_error(cli, "User %s is not connected", argv[0]);
 		return CLI_OK;
 	}
 
@@ -1442,7 +1511,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 		rate_in = rate_out = atoi(argv[1]);
 		if (rate_in < 1)
 		{
-			cli_print(cli, "Invalid rate \"%s\"", argv[1]);
+			cli_error(cli, "Invalid rate \"%s\"", argv[1]);
 			return CLI_OK;
 		}
 	}
@@ -1459,20 +1528,20 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 
 			if (r < 1)
 			{
-				cli_print(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]);
+				cli_error(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]);
 				return CLI_OK;
 			}
 		}
 	}
 	else
 	{
-		cli_print(cli, "Invalid arguments");
+		cli_error(cli, "Invalid arguments");
 		return CLI_OK;
 	}
 
 	if ((rate_in && session[s].throttle_in) || (rate_out && session[s].throttle_out))
 	{
-		cli_print(cli, "User %s already throttled, unthrottle first", argv[0]);
+		cli_error(cli, "User %s already throttled, unthrottle first", argv[0]);
 		return CLI_OK;
 	}
 
@@ -1486,7 +1555,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 	if (cli_session_actions[s].throttle_in == -1 &&
 	    cli_session_actions[s].throttle_out == -1)
 	{
-		cli_print(cli, "User %s already throttled at this rate", argv[0]);
+		cli_error(cli, "User %s already throttled at this rate", argv[0]);
 		return CLI_OK;
 	}
 
@@ -1507,7 +1576,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -1515,7 +1584,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a user to unthrottle");
+		cli_error(cli, "Specify a user to unthrottle");
 		return CLI_OK;
 	}
 
@@ -1523,7 +1592,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int
 	{
 		if (!(s = sessionbyuser(argv[i])))
 		{
-			cli_print(cli, "User %s is not connected", argv[i]);
+			cli_error(cli, "User %s is not connected", argv[i]);
 			continue;
 		}
 
@@ -1534,7 +1603,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int
 		}
 		else
 		{
-			cli_print(cli, "User %s not throttled", argv[i]);
+			cli_error(cli, "User %s not throttled", argv[i]);
 		}
 	}
 
@@ -1599,7 +1668,7 @@ static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
 			continue;
 		}
 
-		cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);
+		cli_error(cli, "Invalid debugging flag \"%s\"", argv[i]);
 	}
 
 	return CLI_OK;
@@ -1645,7 +1714,7 @@ static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int arg
 			continue;
 		}
 
-		cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);
+		cli_error(cli, "Invalid debugging flag \"%s\"", argv[i]);
 	}
 
 	return CLI_OK;
@@ -1661,7 +1730,7 @@ static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int
 
 	if (argc != 1)
 	{
-		cli_print(cli, "Specify a plugin to load");
+		cli_error(cli, "Specify a plugin to load");
 		return CLI_OK;
 	}
 
@@ -1671,7 +1740,7 @@ static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int
 			firstfree = i;
 		if (strcmp(config->plugins[i], argv[0]) == 0)
 		{
-			cli_print(cli, "Plugin is already loaded");
+			cli_error(cli, "Plugin is already loaded");
 			return CLI_OK;
 		}
 	}
@@ -1696,7 +1765,7 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 
 	if (argc != 1)
 	{
-		cli_print(cli, "Specify a plugin to remove");
+		cli_error(cli, "Specify a plugin to remove");
 		return CLI_OK;
 	}
 
@@ -1710,7 +1779,7 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 		}
 	}
 
-	cli_print(cli, "Plugin is not loaded");
+	cli_error(cli, "Plugin is not loaded");
 	return CLI_OK;
 }
 
@@ -1796,7 +1865,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 				int len = strlen(argv[0])-1;
 				for (i = 0; config_values[i].key; i++)
 					if (!len || !strncmp(config_values[i].key, argv[0], len))
-						cli_print(cli, "  %s", config_values[i].key);
+						cli_error(cli, "  %s", config_values[i].key);
 			}
 
 			return CLI_OK;
@@ -1816,13 +1885,13 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (argc != 2)
 	{
-		cli_print(cli, "Specify variable and value");
+		cli_error(cli, "Specify variable and value");
 		return CLI_OK;
 	}
 
 	for (i = 0; config_values[i].key; i++)
 	{
-		void *value = ((void *)config) + config_values[i].offset;
+		void *value = ((void *) config) + config_values[i].offset;
 		if (strcmp(config_values[i].key, argv[0]) == 0)
 		{
 			// Found a value to set
@@ -1830,7 +1899,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 			switch (config_values[i].type)
 			{
 			case STRING:
-				strncpy((char *) value, argv[1], config_values[i].size - 1);
+				snprintf((char *) value, config_values[i].size, "%s", argv[1]);
 				break;
 			case INT:
 				*(int *) value = atoi(argv[1]);
@@ -1847,9 +1916,6 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 			case IPv6:
 				inet_pton(AF_INET6, argv[1], value);
 				break;
-			case MAC:
-				parsemac(argv[1], (char *)value);
-				break;
 			case BOOL:
 				if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
 					*(int *) value = 1;
@@ -1857,7 +1923,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 					*(int *) value = 0;
 				break;
 			default:
-				cli_print(cli, "Unknown variable type");
+				cli_error(cli, "Unknown variable type");
 				break;
 			}
 			config->reload_config = 1;
@@ -1865,16 +1931,16 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 		}
 	}
 
-	cli_print(cli, "Unknown variable \"%s\"", argv[0]);
+	cli_error(cli, "Unknown variable \"%s\"", argv[0]);
 	return CLI_OK;
 }
 
 int regular_stuff(struct cli_def *cli)
 {
+#ifdef RINGBUFFER
 	int out = 0;
 	int i;
 
-#ifdef RINGBUFFER
 	for (i = debug_rb_tail; i != ringbuffer->tail; i = (i + 1) % RINGBUFFER_SIZE)
 	{
 		char *m = ringbuffer->buffer[i].message;
@@ -1896,9 +1962,9 @@ int regular_stuff(struct cli_def *cli)
 		if (!show) continue;
 
 		if (!(p = strchr(m, '\n')))
-			p = m + strlen(p);
+			p = m + strlen(m);
 
-		cli_print(cli, "\r%s-%u-%u %.*s",
+		cli_error(cli, "\r%s-%u-%u %.*s",
 			debug_levels[(int)ringbuffer->buffer[i].level],
 			ringbuffer->buffer[i].tunnel,
 			ringbuffer->buffer[i].session,
@@ -1925,13 +1991,13 @@ static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int a
 
 	if (argc != 1 || (as = atoi(argv[0])) < 1 || as > 65535)
 	{
-		cli_print(cli, "Invalid autonomous system number");
+		cli_error(cli, "Invalid autonomous system number");
 		return CLI_OK;
 	}
 
 	if (bgp_configured && as != config->as_number)
 	{
-		cli_print(cli, "Can't change local AS on a running system");
+		cli_error(cli, "Can't change local AS on a running system");
 		return CLI_OK;
 	}
 
@@ -1987,7 +2053,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 	int keepalive;
 	int hold;
 
-    	if (CLI_HELP_REQUESTED)
+	if (CLI_HELP_REQUESTED)
 	{
 		switch (argc)
 		{
@@ -2001,6 +2067,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 			return cli_arg_help(cli, 0,
 				"remote-as", "Set remote autonomous system number",
 				"timers",    "Set timers",
+				"update-source",    "Set source address to use for the BGP session",
 				NULL);
 
 		default:
@@ -2019,25 +2086,28 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 					return cli_arg_help(cli, 1, NULL);
 			}
 
+			if (MATCH("update-source", argv[1]))
+				return cli_arg_help(cli, argc > 3, "A.B.C.D", "Source IP address", NULL);
+
 			return CLI_OK;
 		}
 	}
 
 	if (argc < 3)
 	{
-		cli_print(cli, "Invalid arguments");
+		cli_error(cli, "Invalid arguments");
 		return CLI_OK;
 	}
 
 	if ((i = find_bgp_neighbour(argv[0])) == -2)
 	{
-		cli_print(cli, "Invalid neighbour");
+		cli_error(cli, "Invalid neighbour");
 		return CLI_OK;
 	}
 
 	if (i == -1)
 	{
-		cli_print(cli, "Too many neighbours (max %d)", BGP_NUM_PEERS);
+		cli_error(cli, "Too many neighbours (max %d)", BGP_NUM_PEERS);
 		return CLI_OK;
 	}
 
@@ -2046,30 +2116,51 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 		int as = atoi(argv[2]);
 		if (as < 0 || as > 65535)
 		{
-			cli_print(cli, "Invalid autonomous system number");
+			cli_error(cli, "Invalid autonomous system number");
 			return CLI_OK;
 		}
 
 		if (!config->neighbour[i].name[0])
 		{
-			snprintf(config->neighbour[i].name, sizeof(config->neighbour[i].name), argv[0]);
+			snprintf(config->neighbour[i].name, sizeof(config->neighbour[i].name), "%s", argv[0]);
 			config->neighbour[i].keepalive = -1;
 			config->neighbour[i].hold = -1;
+			config->neighbour[i].update_source.s_addr = INADDR_ANY;
 		}
 
 		config->neighbour[i].as = as;
 		return CLI_OK;
 	}
 
+	if (MATCH("update-source", argv[1]))
+	{
+		struct in_addr addr;
+
+		if (!config->neighbour[i].name[0])
+		{
+			cli_error(cli, "Specify remote-as first");
+			return CLI_OK;
+		}
+
+		if (!inet_aton(argv[2], &addr))
+		{
+			cli_error(cli, "Cannot parse IP \"%s\"", argv[2]);
+			return CLI_OK;
+		}
+
+		config->neighbour[i].update_source = addr;
+		return CLI_OK;
+	}
+
 	if (argc != 4 || !MATCH("timers", argv[1]))
 	{
-		cli_print(cli, "Invalid arguments");
+		cli_error(cli, "Invalid arguments");
 		return CLI_OK;
 	}
 
 	if (!config->neighbour[i].name[0])
 	{
-		cli_print(cli, "Specify remote-as first");
+		cli_error(cli, "Specify remote-as first");
 		return CLI_OK;
 	}
 
@@ -2078,13 +2169,13 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 
 	if (keepalive < 1 || keepalive > 65535)
 	{
-		cli_print(cli, "Invalid keepalive time");
+		cli_error(cli, "Invalid keepalive time");
 		return CLI_OK;
 	}
 
 	if (hold < 3 || hold > 65535)
 	{
-		cli_print(cli, "Invalid hold time");
+		cli_error(cli, "Invalid hold time");
 		return CLI_OK;
 	}
 
@@ -2097,14 +2188,14 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 	config->neighbour[i].keepalive = keepalive;
 	config->neighbour[i].hold = hold;
 
-    	return CLI_OK;
+	return CLI_OK;
 }
 
 static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	int i;
 
-    	if (CLI_HELP_REQUESTED)
+	if (CLI_HELP_REQUESTED)
 		return cli_arg_help(cli, argc > 0,
 			"A.B.C.D", "BGP neighbour address",
 			"NAME",    "BGP neighbour name",
@@ -2112,24 +2203,24 @@ static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char
 
 	if (argc != 1)
 	{
-		cli_print(cli, "Specify a BGP neighbour");
+		cli_error(cli, "Specify a BGP neighbour");
 		return CLI_OK;
 	}
 
 	if ((i = find_bgp_neighbour(argv[0])) == -2)
 	{
-		cli_print(cli, "Invalid neighbour");
+		cli_error(cli, "Invalid neighbour");
 		return CLI_OK;
 	}
 
 	if (i < 0 || !config->neighbour[i].name[0])
 	{
-		cli_print(cli, "Neighbour %s not configured", argv[0]);
+		cli_error(cli, "Neighbour %s not configured", argv[0]);
 		return CLI_OK;
 	}
 
 	memset(&config->neighbour[i], 0, sizeof(config->neighbour[i]));
-    	return CLI_OK;
+	return CLI_OK;
 }
 
 static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc)
@@ -2287,17 +2378,6 @@ static int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int
 #endif /* BGP*/
 
 static int filt;
-static int find_access_list(char const *name)
-{
-	int i;
-
-	for (i = 0; i < MAXFILTER; i++)
-		if (!(*ip_filters[i].name && strcmp(ip_filters[i].name, name)))
-			return i;
-
-	return -1;
-}
-
 static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 {
 	int extended;
@@ -2327,7 +2407,7 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 
 	if (argc != 2)
 	{
-		cli_print(cli, "Specify access-list type and name");
+		cli_error(cli, "Specify access-list type and name");
 		return CLI_OK;
 	}
 
@@ -2337,23 +2417,23 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 		extended = 1;
 	else
 	{
-		cli_print(cli, "Invalid access-list type");
+		cli_error(cli, "Invalid access-list type");
 		return CLI_OK;
 	}
 
 	if (strlen(argv[1]) > sizeof(ip_filters[0].name) - 1 ||
 	    strspn(argv[1], "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-") != strlen(argv[1]))
 	{
-		cli_print(cli, "Invalid access-list name");
+		cli_error(cli, "Invalid access-list name");
 		return CLI_OK;
 	}
 
-	filt = find_access_list(argv[1]);
+	filt = find_filter(argv[1], strlen(argv[1]));
 	if (add)
 	{
 		if (filt < 0)
 		{
-			cli_print(cli, "Too many access-lists");
+			cli_error(cli, "Too many access-lists");
 			return CLI_OK;
 		}
 
@@ -2366,7 +2446,7 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 		}
 		else if (ip_filters[filt].extended != extended)
 		{
-			cli_print(cli, "Access-list is %s",
+			cli_error(cli, "Access-list is %s",
 				ip_filters[filt].extended ? "extended" : "standard");
 
 			return CLI_OK;
@@ -2378,14 +2458,14 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 
 	if (filt < 0 || !*ip_filters[filt].name)
 	{
-		cli_print(cli, "Access-list not defined");
+		cli_error(cli, "Access-list not defined");
 		return CLI_OK;
 	}
 
 	// racy
 	if (ip_filters[filt].used)
 	{
-		cli_print(cli, "Access-list in use");
+		cli_error(cli, "Access-list in use");
 		return CLI_OK;
 	}
 
@@ -2484,7 +2564,7 @@ static char const *show_access_list_rule(int extended, ip_filter_rulet *rule)
 	return buf;
 }
 
-ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char **argv, int argc)
+static ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	static ip_filter_rulet rule;
 	struct in_addr addr;
@@ -2511,7 +2591,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 	if (argc < 3)
 	{
-		cli_print(cli, "Specify rule details");
+		cli_error(cli, "Specify rule details");
 		return NULL;
 	}
 
@@ -2528,7 +2608,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 		rule.proto = IPPROTO_TCP;
 	else
 	{
-		cli_print(cli, "Invalid protocol \"%s\"", argv[0]);
+		cli_error(cli, "Invalid protocol \"%s\"", argv[0]);
 		return NULL;
 	}
 
@@ -2551,7 +2631,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 			port = &rule.dst_ports;
 			if (a >= argc)
 			{
-				cli_print(cli, "Specify destination");
+				cli_error(cli, "Specify destination");
 				return NULL;
 			}
 		}
@@ -2566,13 +2646,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 		{
 			if (++a >= argc)
 			{
-				cli_print(cli, "Specify host ip address");
+				cli_error(cli, "Specify host ip address");
 				return NULL;
 			}
 
 			if (!inet_aton(argv[a], &addr))
 			{
-				cli_print(cli, "Cannot parse IP \"%s\"", argv[a]);
+				cli_error(cli, "Cannot parse IP \"%s\"", argv[a]);
 				return NULL;
 			}
 
@@ -2584,13 +2664,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 		{
 			if (a >= argc - 1)
 			{
-				cli_print(cli, "Specify %s ip address and wildcard", i ? "destination" : "source");
+				cli_error(cli, "Specify %s ip address and wildcard", i ? "destination" : "source");
 				return NULL;
 			}
 
 			if (!inet_aton(argv[a], &addr))
 			{
-				cli_print(cli, "Cannot parse IP \"%s\"", argv[a]);
+				cli_error(cli, "Cannot parse IP \"%s\"", argv[a]);
 				return NULL;
 			}
 
@@ -2598,7 +2678,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 			if (!inet_aton(argv[++a], &addr))
 			{
-				cli_print(cli, "Cannot parse IP \"%s\"", argv[a]);
+				cli_error(cli, "Cannot parse IP \"%s\"", argv[a]);
 				return NULL;
 			}
 
@@ -2626,13 +2706,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 		if (++a >= argc)
 		{
-			cli_print(cli, "Specify port");
+			cli_error(cli, "Specify port");
 			return NULL;
 		}
 
 		if (!(port->port = atoi(argv[a])))
 		{
-			cli_print(cli, "Invalid port \"%s\"", argv[a]);
+			cli_error(cli, "Invalid port \"%s\"", argv[a]);
 			return NULL;
 		}
 			
@@ -2642,13 +2722,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 		if (a >= argc)
 		{
-			cli_print(cli, "Specify port");
+			cli_error(cli, "Specify port");
 			return NULL;
 		}
 
 		if (!(port->port2 = atoi(argv[a])) || port->port2 < port->port)
 		{
-			cli_print(cli, "Invalid port \"%s\"", argv[a]);
+			cli_error(cli, "Invalid port \"%s\"", argv[a]);
 			return NULL;
 		}
 			
@@ -2671,7 +2751,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 			if (++a >= argc)
 			{
-				cli_print(cli, "Specify tcp flags");
+				cli_error(cli, "Specify tcp flags");
 				return NULL;
 			}
 
@@ -2689,7 +2769,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 				else if (MATCH("urg", &argv[a][1])) *f |= TCP_FLAG_URG;
 				else
 				{
-					cli_print(cli, "Invalid tcp flag \"%s\"", argv[a]);
+					cli_error(cli, "Invalid tcp flag \"%s\"", argv[a]);
 					return NULL;
 				}
 
@@ -2702,7 +2782,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 	{
 		if (rule.src_ports.op || rule.dst_ports.op || rule.tcp_flag_op)
 		{
-			cli_print(cli, "Can't specify \"fragments\" on rules with layer 4 matches");
+			cli_error(cli, "Can't specify \"fragments\" on rules with layer 4 matches");
 			return NULL;
 		}
 
@@ -2712,14 +2792,14 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char *
 
 	if (a < argc)
 	{
-		cli_print(cli, "Invalid flag \"%s\"", argv[a]);
+		cli_error(cli, "Invalid flag \"%s\"", argv[a]);
 		return NULL;
 	}
 
 	return &rule;
 }
 
-ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char **argv, int argc)
+static ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	static ip_filter_rulet rule;
 	struct in_addr addr;
@@ -2770,7 +2850,7 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char *
 
 	if (argc < 1)
 	{
-		cli_print(cli, "Specify rule details");
+		cli_error(cli, "Specify rule details");
 		return NULL;
 	}
 
@@ -2789,13 +2869,13 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char *
 	{
 		if (argc != 2)
 		{
-			cli_print(cli, "Specify host ip address");
+			cli_error(cli, "Specify host ip address");
 			return NULL;
 		}
 
 		if (!inet_aton(argv[1], &addr))
 		{
-			cli_print(cli, "Cannot parse IP \"%s\"", argv[1]);
+			cli_error(cli, "Cannot parse IP \"%s\"", argv[1]);
 			return NULL;
 		}
 
@@ -2806,13 +2886,13 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char *
 	{
 		if (argc > 2)
 		{
-			cli_print(cli, "Specify source ip address and wildcard");
+			cli_error(cli, "Specify source ip address and wildcard");
 			return NULL;
 		}
 
 		if (!inet_aton(argv[0], &addr))
 		{
-			cli_print(cli, "Cannot parse IP \"%s\"", argv[0]);
+			cli_error(cli, "Cannot parse IP \"%s\"", argv[0]);
 			return NULL;
 		}
 
@@ -2822,7 +2902,7 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char *
 		{
 			if (!inet_aton(argv[1], &addr))
 			{
-				cli_print(cli, "Cannot parse IP \"%s\"", argv[1]);
+				cli_error(cli, "Cannot parse IP \"%s\"", argv[1]);
 				return NULL;
 			}
 
@@ -2853,11 +2933,11 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar
 			return CLI_OK;
 		}
 
-		if (!memcmp(&ip_filters[filt].rules[i], rule, sizeof(*rule)))
+		if (!memcmp(&ip_filters[filt].rules[i], rule, offsetof(ip_filter_rulet, counter)))
 			return CLI_OK;
 	}
 
-	cli_print(cli, "Too many rules");
+	cli_error(cli, "Too many rules");
 	return CLI_OK;
 }
 
@@ -2893,7 +2973,7 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -2901,13 +2981,13 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (argc != 3 && argc != 5)
 	{
-		cli_print(cli, "Specify a user and filters");
+		cli_error(cli, "Specify a user and filters");
 		return CLI_OK;
 	}
 
 	if (!(s = sessionbyuser(argv[0])))
 	{
-		cli_print(cli, "User %s is not connected", argv[0]);
+		cli_error(cli, "User %s is not connected", argv[0]);
 		return CLI_OK;
 	}
 
@@ -2921,7 +3001,7 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
 		{
 			if (session[s].filter_in)
 			{
-				cli_print(cli, "Input already filtered");
+				cli_error(cli, "Input already filtered");
 				return CLI_OK;
 			}
 			f = &cli_session_actions[s].filter_in;
@@ -2930,21 +3010,21 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
 		{
 			if (session[s].filter_out)
 			{
-				cli_print(cli, "Output already filtered");
+				cli_error(cli, "Output already filtered");
 				return CLI_OK;
 			}
 			f = &cli_session_actions[s].filter_out;
 		}
 		else
 		{
-			cli_print(cli, "Invalid filter specification");
+			cli_error(cli, "Invalid filter specification");
 			return CLI_OK;
 		}
 
-		v = find_access_list(argv[i+1]);
+		v = find_filter(argv[i+1], strlen(argv[i+1]));
 		if (v < 0 || !*ip_filters[v].name)
 		{
-			cli_print(cli, "Access-list %s not defined", argv[i+1]);
+			cli_error(cli, "Access-list %s not defined", argv[i+1]);
 			return CLI_OK;
 		}
 
@@ -2968,7 +3048,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar
 
 	if (!config->cluster_iam_master)
 	{
-		cli_print(cli, "Can't do this on a slave.  Do it on %s",
+		cli_error(cli, "Can't do this on a slave.  Do it on %s",
 			fmtaddr(config->cluster_master_address, 0));
 
 		return CLI_OK;
@@ -2976,7 +3056,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar
 
 	if (!argc)
 	{
-		cli_print(cli, "Specify a user to remove filters from");
+		cli_error(cli, "Specify a user to remove filters from");
 		return CLI_OK;
 	}
 
@@ -2984,7 +3064,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar
 	{
 		if (!(s = sessionbyuser(argv[i])))
 		{
-			cli_print(cli, "User %s is not connected", argv[i]);
+			cli_error(cli, "User %s is not connected", argv[i]);
 			continue;
 		}
 
@@ -2995,7 +3075,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar
 		}
 		else
 		{
-			cli_print(cli, "User %s not filtered", argv[i]);
+			cli_error(cli, "User %s not filtered", argv[i]);
 		}
 	}
 
@@ -3011,18 +3091,18 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 
 	if (argc < 1)
 	{
-		cli_print(cli, "Specify a filter name");
+		cli_error(cli, "Specify a filter name");
 		return CLI_OK;
 	}
 
 	for (i = 0; i < argc; i++)
 	{
-		int f = find_access_list(argv[i]);
+		int f = find_filter(argv[i], strlen(argv[i]));
 		ip_filter_rulet *rules;
 
 		if (f < 0 || !*ip_filters[f].name)
 		{
-			cli_print(cli, "Access-list %s not defined", argv[i]);
+			cli_error(cli, "Access-list %s not defined", argv[i]);
 			return CLI_OK;
 		}
 
@@ -3037,7 +3117,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 		{
 			char const *r = show_access_list_rule(ip_filters[f].extended, rules);
 		    	if (rules->counter)
-				cli_print(cli, "%s (%d match%s)", r,
+				cli_print(cli, "%s (%u match%s)", r,
 					rules->counter, rules->counter > 1 ? "es" : "");
 			else
 				cli_print(cli, "%s", r);
@@ -3047,12 +3127,94 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 	return CLI_OK;
 }
 
-// Convert a string in the form of abcd.ef12.3456 into char[6]
-void parsemac(char *string, char mac[6])
+static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc)
 {
-	if (sscanf(string, "%02x%02x.%02x%02x.%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
-		return;
-	if (sscanf(string, "%02x%02x:%02x%02x:%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
-		return;
-	memset(mac, 0, 6);
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
+
+	kill(getppid(), SIGQUIT);
+	return CLI_OK;
 }
+
+static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
+
+	kill(getppid(), SIGHUP);
+	return CLI_OK;
+}
+
+#ifdef LAC
+
+static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	int ret;
+
+	if (CLI_HELP_REQUESTED)
+	{
+		switch (argc)
+		{
+		case 1:
+			return cli_arg_help(cli, 0,
+				"MASK", "Users mask to forward (ex: myISP@operator.com)", NULL);
+
+		case 2:
+			return cli_arg_help(cli, 0,
+				"IP", "IP of the remote LNS(ex: 64.64.64.64)", NULL);
+
+		case 3:
+			return cli_arg_help(cli, 0,
+				"PORT", "Port of the remote LNS (ex: 1701)", NULL);
+
+		case 4:
+			return cli_arg_help(cli, 0,
+				"SECRET", "l2tp secret of the remote LNS (ex: mysecretpsw)", NULL);
+
+		default:
+			return cli_arg_help(cli, argc > 1, NULL);
+		}
+	}
+
+	if (argc != 4)
+	{
+		cli_error(cli, "Specify variable and value");
+		return CLI_OK;
+	}
+
+	// lac_addremotelns(mask, IP_RemoteLNS, Port_RemoteLNS, SecretRemoteLNS)
+	ret = lac_addremotelns(argv[0], argv[1], argv[2], argv[3]);
+
+	if (ret)
+	{
+		cli_print(cli, "setforward %s %s %s %s", argv[0], argv[1], argv[2], argv[3]);
+		if (ret == 2)
+			cli_print(cli, "%s Updated, the tunnel must be dropped", argv[0]);
+	}
+	else
+		cli_error(cli, "ERROR setforward %s %s %s %s", argv[0], argv[1], argv[2], argv[3]);
+
+	return CLI_OK;
+}
+
+static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	confrlnsidt idrlns;
+	char strdisp[1024];
+
+	if (CLI_HELP_REQUESTED)
+	{
+		return cli_arg_help(cli, 0, "remotelns-conf", "Show a list of remote LNS configurations", NULL);
+	}
+
+	for (idrlns = 0; idrlns < MAXRLNSTUNNEL; idrlns++)
+	{
+		if (lac_cli_show_remotelns(idrlns, strdisp) != 0)
+			cli_print(cli, "%s", strdisp);
+		else
+			break;
+	}
+
+	return CLI_OK;
+}
+#endif