X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c9dedbc735ba69c1f2c9ebc3281c87a1465db127..bdc2baa573df926eb1b0034d11a53622385a4241:/cli.c?ds=sidebyside

diff --git a/cli.c b/cli.c
index 4dd4586..6258bc3 100644
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.45 2005-01-07 07:15:10 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.65 2005-08-10 07:53:56 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -25,6 +25,7 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.45 2005-01-07 07:15:10 bodea Exp $";
 #include <libcli.h>
 
 #include "l2tpns.h"
+#include "constants.h"
 #include "util.h"
 #include "cluster.h"
 #include "tbf.h"
@@ -49,15 +50,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 +60,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 +85,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);
@@ -102,6 +102,11 @@ static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
 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
 static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int argc);
@@ -149,7 +154,7 @@ 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");
 	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");
@@ -285,13 +290,14 @@ 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 +317,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 +326,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 +367,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 +408,28 @@ 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, "\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);
 			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, "\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,7 +494,7 @@ 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",
+	cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %-15s %s",
 			"SID",
 			"TID",
 			"Username",
@@ -483,6 +502,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			"I",
 			"T",
 			"G",
+			"6",
 			"opened",
 			"downloaded",
 			"uploaded",
@@ -493,7 +513,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 	for (i = 1; i < MAXSESSION; i++)
 	{
 		if (!session[i].opened) continue;
-		cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %10u %10lu %10lu %4u %-15s %s",
+		cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %-15s %s",
 				i,
 				session[i].tunnel,
 				session[i].user[0] ? session[i].user : "*",
@@ -501,9 +521,10 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 				(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),
 				session[i].calling[0] ? session[i].calling : "*");
@@ -641,28 +662,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 +714,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));
@@ -721,10 +748,34 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 	cli_print(cli, "%-30s%u", "call_radiussend",		GET_STAT(call_radiussend));
 	cli_print(cli, "%-30s%u", "call_radiusretry",		GET_STAT(call_radiusretry));
 	cli_print(cli, "%-30s%u", "call_random_data",		GET_STAT(call_random_data));
-#endif
+#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_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	if (CLI_HELP_REQUESTED)
+		return CLI_HELP_NO_ARGS;
+
+	memset(_statistics, 0, sizeof(struct Tstats));
+	SET_STAT(last_reset, time(NULL));
+
+	cli_print(cli, "Counters cleared");
+	return CLI_OK;
+}
+#endif /* STATISTICS */
+
 static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	int tag = 0;
@@ -779,7 +830,6 @@ static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int
 		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);
@@ -881,7 +931,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;
 }
@@ -998,6 +1048,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int
 		"IPCP",
 		"START",
 		"STOP",
+		"INTRM",
 		"WAIT",
 	};
 
@@ -1112,16 +1163,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;
@@ -1133,7 +1174,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;
@@ -1141,7 +1182,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;
 	}
 
@@ -1149,7 +1190,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;
 		}
 
@@ -1174,7 +1215,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;
@@ -1182,7 +1223,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;
 	}
 
@@ -1190,19 +1231,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;
 		}
 
@@ -1224,7 +1265,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;
@@ -1232,7 +1273,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;
 	}
 
@@ -1240,7 +1281,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;
 		}
 
@@ -1251,7 +1292,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 		}
 		else
 		{
-			cli_print(cli, "Session %d is not active.", s);
+			cli_error(cli, "Session %d is not active.", s);
 		}
 	}
 
@@ -1291,7 +1332,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;
@@ -1299,27 +1340,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;
 	}
 
@@ -1342,7 +1383,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;
@@ -1350,7 +1391,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;
 	}
 
@@ -1358,7 +1399,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;
 		}
 
@@ -1416,7 +1457,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;
@@ -1424,13 +1465,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;
 	}
 
@@ -1443,7 +1484,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;
 		}
 	}
@@ -1460,20 +1501,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;
 	}
 
@@ -1487,7 +1528,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;
 	}
 
@@ -1508,7 +1549,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;
@@ -1516,7 +1557,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;
 	}
 
@@ -1524,7 +1565,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;
 		}
 
@@ -1535,7 +1576,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]);
 		}
 	}
 
@@ -1600,7 +1641,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;
@@ -1646,7 +1687,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;
@@ -1662,7 +1703,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;
 	}
 
@@ -1672,7 +1713,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;
 		}
 	}
@@ -1697,7 +1738,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;
 	}
 
@@ -1711,7 +1752,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;
 }
 
@@ -1797,7 +1838,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;
@@ -1817,7 +1858,7 @@ 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;
 	}
 
@@ -1858,7 +1899,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;
@@ -1866,16 +1907,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;
@@ -1899,7 +1940,7 @@ int regular_stuff(struct cli_def *cli)
 		if (!(p = strchr(m, '\n')))
 			p = m + strlen(p);
 
-		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,
@@ -1926,13 +1967,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;
 	}
 
@@ -2026,19 +2067,19 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 
 	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;
 	}
 
@@ -2047,7 +2088,7 @@ 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;
 		}
 
@@ -2064,13 +2105,13 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 
 	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;
 	}
 
@@ -2079,13 +2120,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;
 	}
 
@@ -2113,19 +2154,19 @@ 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;
 	}
 
@@ -2288,17 +2329,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;
@@ -2328,7 +2358,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;
 	}
 
@@ -2338,23 +2368,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;
 		}
 
@@ -2367,7 +2397,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;
@@ -2379,14 +2409,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;
 	}
 
@@ -2485,7 +2515,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;
@@ -2512,7 +2542,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;
 	}
 
@@ -2529,7 +2559,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;
 	}
 
@@ -2552,7 +2582,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;
 			}
 		}
@@ -2567,13 +2597,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;
 			}
 
@@ -2585,13 +2615,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;
 			}
 
@@ -2599,7 +2629,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;
 			}
 
@@ -2627,13 +2657,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;
 		}
 			
@@ -2643,13 +2673,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;
 		}
 			
@@ -2672,7 +2702,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;
 			}
 
@@ -2690,7 +2720,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;
 				}
 
@@ -2703,7 +2733,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;
 		}
 
@@ -2713,14 +2743,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;
@@ -2771,7 +2801,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;
 	}
 
@@ -2790,13 +2820,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;
 		}
 
@@ -2807,13 +2837,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;
 		}
 
@@ -2823,7 +2853,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;
 			}
 
@@ -2858,7 +2888,7 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar
 			return CLI_OK;
 	}
 
-	cli_print(cli, "Too many rules");
+	cli_error(cli, "Too many rules");
 	return CLI_OK;
 }
 
@@ -2894,7 +2924,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;
@@ -2902,13 +2932,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;
 	}
 
@@ -2922,7 +2952,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;
@@ -2931,21 +2961,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;
 		}
 
@@ -2969,7 +2999,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;
@@ -2977,7 +3007,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;
 	}
 
@@ -2985,7 +3015,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;
 		}
 
@@ -2996,7 +3026,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]);
 		}
 	}
 
@@ -3012,18 +3042,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;
 		}