X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/e6208f516d2437f7effeee7305bd3ecae93e4c11..cb031e775d57da45299c8dfdfabe7240705338e7:/cli.c

diff --git a/cli.c b/cli.c
index c2e0c13..e590069 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.67 2005/11/14 09:49:01 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.75 2006/08/02 13:35:39 bodea Exp $";
 
 #include <stdio.h>
 #include <stddef.h>
@@ -36,6 +36,7 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.67 2005/11/14 09:49:01 bodea Exp $";
 #endif
 
 extern tunnelt *tunnel;
+extern bundlet *bundle;
 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;
@@ -101,7 +102,6 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 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);
@@ -269,7 +269,7 @@ void init_cli(char *hostname)
 	}
 
 	memset(&addr, 0, sizeof(addr));
-	clifd = socket(PF_INET, SOCK_STREAM, 6);
+	clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 	setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 	{
 		int flags;
@@ -426,8 +426,18 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			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);
+ 		        if (session[s].session_timeout)
+			{
+			    	clockt opened = session[s].opened;
+				if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
+					opened = bundle[session[s].bundle].online_time;
+
+ 				cli_print(cli, "\tSess Timeout:\t%u seconds", session[s].session_timeout - (opened ? abs(time_now - opened) : 0));
+			}
+
+ 		        if (session[s].idle_timeout)
+ 				cli_print(cli, "\tIdle Timeout:\t%u seconds", session[s].idle_timeout - (session[s].last_data ? abs(time_now - session[s].last_data) : 0));
+
 			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);
@@ -966,14 +976,6 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
 			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);
-		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));
 	}
 
 	cli_print(cli, "# Plugins");
@@ -1890,9 +1892,6 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 			case IPv6:
 				inet_pton(AF_INET6, argv[1], value);
 				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;
@@ -3069,7 +3068,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 		{
 			char const *r = show_access_list_rule(ip_filters[f].extended, rules);
 		    	if (rules->counter)
-				cli_print(cli, "%s (%d match%s)", r,
+				cli_print(cli, "%s (%u match%s)", r,
 					rules->counter, rules->counter > 1 ? "es" : "");
 			else
 				cli_print(cli, "%s", r);
@@ -3078,13 +3077,3 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 
 	return CLI_OK;
 }
-
-// Convert a string in the form of abcd.ef12.3456 into char[6]
-void parsemac(char *string, char mac[6])
-{
-	if (sscanf(string, "%02x%02x.%02x%02x.%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
-		return;
-	if (sscanf(string, "%02x%02x:%02x%02x:%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
-		return;
-	memset(mac, 0, 6);
-}