X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/54443c26c4624b8630ca14a71853123a8cc8c3dd..1c209703a398a3d56d483d25b008f122b437ea65:/cli.c

diff --git a/cli.c b/cli.c
index 26e91b4..c2e54be 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.44 2004-12-18 01:20:05 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.51 2005-01-13 08:26:25 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -290,8 +290,9 @@ void cli_do(int sockfd)
 	if (fork_and_close()) return;
 	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));
@@ -322,7 +323,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);
 }
 
@@ -646,23 +649,24 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 	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),
@@ -720,7 +724,19 @@ 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));
+	cli_print(cli, "%-30s%u", "call_random_data",		GET_STAT(call_random_data));
 #endif
+
+	{
+		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;
 }
 
@@ -1116,8 +1132,10 @@ static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, i
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
 
-	cli_print(cli, "Counters cleared");
+	memset(_statistics, 0, sizeof(struct Tstats));
 	SET_STAT(last_reset, time(NULL));
+
+	cli_print(cli, "Counters cleared");
 	return CLI_OK;
 }
 
@@ -1822,7 +1840,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 
 	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 +1848,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]);
@@ -2052,7 +2070,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 
 		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;
 		}