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

diff --git a/cli.c b/cli.c
index 10c2ed5..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.43.2.2 2005/01/12 05:20:49 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>
@@ -289,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));
@@ -321,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);
 }
 
@@ -640,6 +643,39 @@ 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)
@@ -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;
 }
 
@@ -1713,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;