X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/9cb7003d3390c34d3f01bb10fe5542d433ae99de..9fd80a9b505cc08c47c95881c6c185c1b22578cf:/cli.c

diff --git a/cli.c b/cli.c
index e90b2a6..ca29fe0 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.43.2.4 2005/01/13 08:03:14 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -98,7 +98,6 @@ 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 regular_stuff(struct cli_def *cli);
 static void parsemac(char *string, char mac[6]);
 
@@ -290,8 +289,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 +322,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);
 }
 
@@ -641,28 +643,62 @@ static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int a
 	return CLI_OK;
 }
 
+static char *duration(time_t secs)
+{
+	static char *buf = NULL;
+	int p = 0;
+
+	if (!buf) buf = calloc(64, 1);
+
+	if (secs >= 86400)
+	{
+		int days = secs / 86400;
+		p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
+		secs %= 86400;
+	}
+
+	if (secs >= 3600)
+	{
+		int mins = secs / 60;
+		int hrs = mins / 60;
+
+		mins %= 60;
+		sprintf(buf + p, "%d:%02d", hrs, mins);
+	}
+	else if (secs >= 60)
+	{
+		int mins = secs / 60;
+		sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
+	}
+	else
+		sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
+
+	return buf;
+}
+
 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),
@@ -721,6 +757,10 @@ 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));
 #endif
+
+	cli_print(cli, "");
+	cli_print(cli, "Counters last reset %s ago", duration(time_now - GET_STAT(last_reset)));
+
 	return CLI_OK;
 }
 
@@ -890,7 +930,6 @@ static char const *show_access_list_rule(int extended, ip_filter_rulet *rule);
 static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	int i;
-	char ipv6addr[INET6_ADDRSTRLEN];
 
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -901,27 +940,25 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
 	{
 		void *value = ((void *)config) + config_values[i].offset;
 		if (config_values[i].type == STRING)
-			cli_print(cli, "set %s \"%.*s\"", config_values[i].key, config_values[i].size, (char *) value);
-		else if (config_values[i].type == IPv4)
-			cli_print(cli, "set %s %s", config_values[i].key, fmtaddr(*(in_addr_t *) value, 0));
-		else if (config_values[i].type == IPv6)
-			cli_print(cli, "set %s %s", config_values[i].key, inet_ntop(AF_INET6, value, ipv6addr, INET6_ADDRSTRLEN));
+			cli_print(cli, "set %s \"%.*s\"", config_values[i].key, config_values[i].size, (char *)value);
+		else if (config_values[i].type == IP)
+			cli_print(cli, "set %s %s", config_values[i].key, fmtaddr(*(unsigned *)value, 0));
 		else if (config_values[i].type == SHORT)
-			cli_print(cli, "set %s %hu", config_values[i].key, *(short *) value);
+			cli_print(cli, "set %s %hu", config_values[i].key, *(short *)value);
 		else if (config_values[i].type == BOOL)
-			cli_print(cli, "set %s %s", config_values[i].key, (*(int *) value) ? "yes" : "no");
+			cli_print(cli, "set %s %s", config_values[i].key, (*(int *)value) ? "yes" : "no");
 		else if (config_values[i].type == INT)
-			cli_print(cli, "set %s %d", config_values[i].key, *(int *) value);
+			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);
+			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));
+					*(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");
@@ -1116,8 +1153,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;
 }
 
@@ -1714,39 +1753,6 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 	return CLI_OK;
 }
 
-static char *duration(time_t secs)
-{
-	static char *buf = NULL;
-	int p = 0;
-
-	if (!buf) buf = calloc(64, 1);
-
-	if (secs >= 86400)
-	{
-		int days = secs / 86400;
-		p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
-		secs %= 86400;
-	}
-
-	if (secs >= 3600)
-	{
-		int mins = secs / 60;
-		int hrs = mins / 60;
-
-		mins %= 60;
-		sprintf(buf + p, "%d:%02d", hrs, mins);
-	}
-	else if (secs >= 60)
-	{
-		int mins = secs / 60;
-		sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
-	}
-	else
-		sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
-
-	return buf;
-}
-
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	FILE *fh;
@@ -1830,31 +1836,28 @@ 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);
+				strncpy((char *)value, argv[1], config_values[i].size - 1);
 				break;
 			case INT:
-				*(int *) value = atoi(argv[1]);
+				*(int *)value = atoi(argv[1]);
 				break;
 			case UNSIGNED_LONG:
-				*(unsigned long *) value = atol(argv[1]);
+				*(unsigned long *)value = atol(argv[1]);
 				break;
 			case SHORT:
-				*(short *) value = atoi(argv[1]);
-				break;
-			case IPv4:
-				*(in_addr_t *) value = inet_addr(argv[1]);
+				*(short *)value = atoi(argv[1]);
 				break;
-			case IPv6:
-				inet_pton(AF_INET6, argv[1], value);
+			case IP:
+				*(unsigned *)value = inet_addr(argv[1]);
 				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;
+					*(int *)value = 1;
 				else
-					*(int *) value = 0;
+					*(int *)value = 0;
 				break;
 			default:
 				cli_print(cli, "Unknown variable type");