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

diff --git a/cli.c b/cli.c
index ca29fe0..d5a15d7 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.4 2005/01/13 08:03:14 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.43.2.6 2005/05/30 02:55:40 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -406,6 +406,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			cli_print(cli, "\tTunnel ID:\t%d", session[s].tunnel);
 			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, "\tOpened:\t\t%u seconds", abs(time_now - session[s].opened));
 			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);
@@ -643,39 +644,6 @@ 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)
@@ -758,8 +726,15 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 	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)));
+	{
+		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;
 }
@@ -1753,6 +1728,39 @@ 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;