X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/133cc062ad0a02f2de24d70d4ed579786bd69a4d..db0ded520aee06ef21acbc519ea078e2463a4a96:/cli.c?ds=inline

diff --git a/cli.c b/cli.c
index 968d04c..7ea75ed 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.14 2004-08-26 06:24:12 fred_nerk Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.18 2004-10-28 03:31:11 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -102,6 +102,7 @@ int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
 int regular_stuff(struct cli_def *cli);
+void parsemac(char *string, char mac[6]);
 
 void init_cli(char *hostname)
 {
@@ -114,9 +115,9 @@ void init_cli(char *hostname)
 
 	cli = cli_init();
 	if (hostname && *hostname)
-			cli_set_hostname(cli, hostname);
+		cli_set_hostname(cli, hostname);
 	else
-			cli_set_hostname(cli, "l2tpns");
+		cli_set_hostname(cli, "l2tpns");
 
 	c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
 	cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana");
@@ -228,8 +229,8 @@ void init_cli(char *hostname)
 	addr.sin_port = htons(23);
 	if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
 	{
-			log(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
-			return;
+		log(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
+		return;
 	}
 	listen(clifd, 10);
 }
@@ -364,7 +365,7 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...)
 
 	va_end(ap);
 	if (cr_ok)
-			cli_print(cli, "  <cr>");
+		cli_print(cli, "  <cr>");
 
 	return CLI_OK;
 }
@@ -392,27 +393,27 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
 				continue;
 			}
 			cli_print(cli, "\r\nSession %d:", s);
-			cli_print(cli, "		User:				%s", session[s].user[0] ? session[s].user : "none");
-			cli_print(cli, "		Calling Num:		%s", session[s].calling);
-			cli_print(cli, "		Called Num:		%s", session[s].called);
-			cli_print(cli, "		Tunnel ID:		%d", session[s].tunnel);
-			cli_print(cli, "		IP address:		%s", inet_toa(htonl(session[s].ip)));
-			cli_print(cli, "		HSD sid:		%lu", session[s].sid);
-			cli_print(cli, "		Idle time:		%u seconds", abs(time_now - session[s].last_packet));
-			cli_print(cli, "		Next Recv:		%u", session[s].nr);
-			cli_print(cli, "		Next Send:		%u", session[s].ns);
-			cli_print(cli, "		Bytes In/Out:		%lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin);
-			cli_print(cli, "		Pkts In/Out:		%lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin);
-			cli_print(cli, "		MRU:				%d", session[s].mru);
-			cli_print(cli, "		Radius Session:		%u", session[s].radius);
-			cli_print(cli, "		Rx Speed:		%lu", session[s].rx_connect_speed);
-			cli_print(cli, "		Tx Speed:		%lu", session[s].tx_connect_speed);
+			cli_print(cli, "	User:		%s", session[s].user[0] ? session[s].user : "none");
+			cli_print(cli, "	Calling Num:	%s", session[s].calling);
+			cli_print(cli, "	Called Num:	%s", session[s].called);
+			cli_print(cli, "	Tunnel ID:	%d", session[s].tunnel);
+			cli_print(cli, "	IP address:	%s", inet_toa(htonl(session[s].ip)));
+			cli_print(cli, "	Unique SID:	%lu", session[s].unique_id);
+			cli_print(cli, "	Idle time:	%u seconds", abs(time_now - session[s].last_packet));
+			cli_print(cli, "	Next Recv:	%u", session[s].nr);
+			cli_print(cli, "	Next Send:	%u", session[s].ns);
+			cli_print(cli, "	Bytes In/Out:	%lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin);
+			cli_print(cli, "	Pkts In/Out:	%lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin);
+			cli_print(cli, "	MRU:		%d", session[s].mru);
+			cli_print(cli, "	Radius Session:	%u", session[s].radius);
+			cli_print(cli, "	Rx Speed:	%lu", session[s].rx_connect_speed);
+			cli_print(cli, "	Tx Speed:	%lu", session[s].tx_connect_speed);
 			if (session[s].snoop_ip && session[s].snoop_port)
-				cli_print(cli, "		Intercepted:	%s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);
+				cli_print(cli, "	Intercepted:	%s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);
 			else
-				cli_print(cli, "		Intercepted:	no");
-			cli_print(cli, "		Throttled:		%s", session[s].throttle ? "YES" : "no");
-			cli_print(cli, "		Walled Garden:		%s", session[s].walled_garden ? "YES" : "no");
+				cli_print(cli, "	Intercepted:	no");
+			cli_print(cli, "	Throttled:	%s", session[s].throttle ? "YES" : "no");
+			cli_print(cli, "	Walled Garden:	%s", session[s].walled_garden ? "YES" : "no");
 			b_in = session[s].tbf_in;
 			b_out = session[s].tbf_out;
 			if (b_in || b_out)
@@ -467,6 +468,7 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
 			"idle",
 			"LAC",
 			"CLI");
+
 	for (i = 1; i < MAXSESSION; i++)
 	{
 		char *userip, *tunnelip;
@@ -537,20 +539,21 @@ int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc)
 					continue;
 				}
 				cli_print(cli, "\r\nTunnel %d:", t);
-				cli_print(cli, "		State:				%s", states[tunnel[t].state]);
-				cli_print(cli, "		Hostname:		%s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
-				cli_print(cli, "		Remote IP:		%s", inet_toa(htonl(tunnel[t].ip)));
-				cli_print(cli, "		Remote Port:		%d", tunnel[t].port);
-				cli_print(cli, "		Rx Window:		%u", tunnel[t].window);
-				cli_print(cli, "		Next Recv:		%u", tunnel[t].nr);
-				cli_print(cli, "		Next Send:		%u", tunnel[t].ns);
-				cli_print(cli, "		Queue Len:		%u", tunnel[t].controlc);
-				cli_print(cli, "		Last Packet Age:%u", (unsigned)(time_now - tunnel[t].last));
+				cli_print(cli, "	State:		%s", states[tunnel[t].state]);
+				cli_print(cli, "	Hostname:	%s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
+				cli_print(cli, "	Remote IP:	%s", inet_toa(htonl(tunnel[t].ip)));
+				cli_print(cli, "	Remote Port:	%d", tunnel[t].port);
+				cli_print(cli, "	Rx Window:	%u", tunnel[t].window);
+				cli_print(cli, "	Next Recv:	%u", tunnel[t].nr);
+				cli_print(cli, "	Next Send:	%u", tunnel[t].ns);
+				cli_print(cli, "	Queue Len:	%u", tunnel[t].controlc);
+				cli_print(cli, "	Last Packet Age:%u", (unsigned)(time_now - tunnel[t].last));
 
 				for (x = 0; x < MAXSESSION; x++)
-						if (session[x].tunnel == t && session[x].opened && !session[x].die)
-								sprintf(s, "%s%u ", s, x);
-				cli_print(cli, "		Sessions:		%s", s);
+					if (session[x].tunnel == t && session[x].opened && !session[x].die)
+						sprintf(s, "%s%u ", s, x);
+
+				cli_print(cli, "	Sessions:	%s", s);
 			}
 			return CLI_OK;
 		}
@@ -879,6 +882,14 @@ int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc)
 			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");
@@ -993,20 +1004,20 @@ int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc)
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
 
-	cli_print(cli, " _\n"
-					  "//\\\n"
-					  "V  \\\n"
-					  " \\  \\_\n"
-					  "  \\,'.`-.\n"
-					  "   |\\ `. `.\n"
-					  "   ( \\  `. `-.						_,.-:\\\n"
-					  "	\\ \\   `.  `-._			 __..--' ,-';/\n"
-					  "	 \\ `.   `-.   `-..___..---'   _.--' ,'/\n"
-					  "	  `. `.	`-._		__..--'	,' /\n"
-					  "		`. `-_	 ``--..''	   _.-' ,'\n"
-					  "		  `-_ `-.___		__,--'   ,'\n"
-					  "			 `-.__  `----\"\"\"	__.-'\n"
-					  "hh				`--..____..--'");
+	cli_print(cli,	" _\n"
+			"//\\\n"
+			"V  \\\n"
+			" \\  \\_\n"
+			"  \\,'.`-.\n"
+			"   |\\ `. `.\n"
+			"   ( \\  `. `-.                        _,.-:\\\n"
+			"    \\ \\   `.  `-._             __..--' ,-';/\n"
+			"     \\ `.   `-.   `-..___..---'   _.--' ,'/\n"
+			"      `. `.    `-._        __..--'    ,' /\n"
+			"        `. `-_     ``--..''       _.-' ,'\n"
+			"          `-_ `-.___        __,--'   ,'\n"
+			"             `-.__  `----\"\"\"    __.-'\n"
+			"hh                `--..____..--'");
 
 	return CLI_OK;
 }
@@ -1267,17 +1278,17 @@ int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
 	{
 		switch (argc)
 		{
-			case 1:
-				return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
+		case 1:
+			return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
 
-			case 2:
-				return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
+		case 2:
+			return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
 
-			case 3:
-				return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
+		case 3:
+			return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
 
-			default:
-				return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
+		default:
+			return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
 		}
 	}
 
@@ -1364,13 +1375,13 @@ int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (CLI_HELP_REQUESTED)
 		return cli_arg_help(cli, 1,
-			"all",	  "Enable debugging for all except \"data\"",
-			"critical", "", // FIXME: add descriptions
+			"all",		"Enable debugging for all except \"data\"",
+			"critical",	"", // FIXME: add descriptions
 			"error",	"",
-			"warning",  "",
-			"info",	 "",
+			"warning",	"",
+			"info",		"",
 			"calls",	"",
-			"data",	 "",
+			"data",		"",
 			NULL);
 
 	if (!argc)
@@ -1382,11 +1393,11 @@ int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
 			{
 				cli_print(cli, "Currently debugging:%s%s%s%s%s%s",
 					(debug_flags.critical) ? " critical" : "",
-					(debug_flags.error)	? " error"	: "",
+					(debug_flags.error)    ? " error"    : "",
 					(debug_flags.warning)  ? " warning"  : "",
-					(debug_flags.info)	 ? " info"	 : "",
-					(debug_flags.calls)	? " calls"	: "",
-					(debug_flags.data)	 ? " data"	 : "");
+					(debug_flags.info)     ? " info"     : "",
+					(debug_flags.calls)    ? " calls"    : "",
+					(debug_flags.data)     ? " data"     : "");
 
 				return CLI_OK;
 			}
@@ -1404,12 +1415,12 @@ int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
 			len = 2; /* distinguish [cr]itical from [ca]lls */
 
 		if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 1; continue; }
-		if (!strncasecmp(argv[i], "error",	len)) { debug_flags.error = 1;	continue; }
+		if (!strncasecmp(argv[i], "error",    len)) { debug_flags.error = 1;    continue; }
 		if (!strncasecmp(argv[i], "warning",  len)) { debug_flags.warning = 1;  continue; }
-		if (!strncasecmp(argv[i], "info",	 len)) { debug_flags.info = 1;	 continue; }
-		if (!strncasecmp(argv[i], "calls",	len)) { debug_flags.calls = 1;	continue; }
-		if (!strncasecmp(argv[i], "data",	 len)) { debug_flags.data = 1;	 continue; }
-		if (!strncasecmp(argv[i], "all",	  len))
+		if (!strncasecmp(argv[i], "info",     len)) { debug_flags.info = 1;     continue; }
+		if (!strncasecmp(argv[i], "calls",    len)) { debug_flags.calls = 1;    continue; }
+		if (!strncasecmp(argv[i], "data",     len)) { debug_flags.data = 1;     continue; }
+		if (!strncasecmp(argv[i], "all",      len))
 		{
 			memset(&debug_flags, 1, sizeof(debug_flags));
 			debug_flags.data = 0;
@@ -1428,18 +1439,18 @@ int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc)
 
 	if (CLI_HELP_REQUESTED)
 		return cli_arg_help(cli, 1,
-			"all",	  "Disable all debugging",
-			"critical", "", // FIXME: add descriptions
+			"all",		"Disable all debugging",
+			"critical",	"", // FIXME: add descriptions
 			"error",	"",
-			"warning",  "",
-			"info",	 "",
+			"warning",	"",
+			"info",		"",
 			"calls",	"",
-			"data",	 "",
+			"data",		"",
 			NULL);
 
 	if (!argc)
 	{
-			memset(&debug_flags, 0, sizeof(debug_flags));
+		memset(&debug_flags, 0, sizeof(debug_flags));
 		return CLI_OK;
 	}
 
@@ -1451,12 +1462,12 @@ int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc)
 			len = 2; /* distinguish [cr]itical from [ca]lls */
 
 		if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 0; continue; }
-		if (!strncasecmp(argv[i], "error",	len)) { debug_flags.error = 0;	continue; }
+		if (!strncasecmp(argv[i], "error",    len)) { debug_flags.error = 0;    continue; }
 		if (!strncasecmp(argv[i], "warning",  len)) { debug_flags.warning = 0;  continue; }
-		if (!strncasecmp(argv[i], "info",	 len)) { debug_flags.info = 0;	 continue; }
-		if (!strncasecmp(argv[i], "calls",	len)) { debug_flags.calls = 0;	continue; }
-		if (!strncasecmp(argv[i], "data",	 len)) { debug_flags.data = 0;	 continue; }
-		if (!strncasecmp(argv[i], "all",	  len))
+		if (!strncasecmp(argv[i], "info",     len)) { debug_flags.info = 0;     continue; }
+		if (!strncasecmp(argv[i], "calls",    len)) { debug_flags.calls = 0;    continue; }
+		if (!strncasecmp(argv[i], "data",     len)) { debug_flags.data = 0;     continue; }
+		if (!strncasecmp(argv[i], "all",      len))
 		{
 			memset(&debug_flags, 0, sizeof(debug_flags));
 			continue;
@@ -1646,30 +1657,33 @@ int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 			cli_print(cli, "Setting \"%s\" to \"%s\"", argv[0], argv[1]);
 			switch (config_values[i].type)
 			{
-				case STRING:
-					strncpy((char *)value, argv[1], config_values[i].size - 1);
-					break;
-				case INT:
-					*(int *)value = atoi(argv[1]);
-					break;
-				case UNSIGNED_LONG:
-					*(unsigned long *)value = atol(argv[1]);
-					break;
-				case SHORT:
-					*(short *)value = atoi(argv[1]);
-					break;
-				case IP:
-					*(unsigned *)value = inet_addr(argv[1]);
-					break;
-				case BOOL:
-					if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
-						*(int *)value = 1;
-					else
-						*(int *)value = 0;
-					break;
-				default:
-					cli_print(cli, "Unknown variable type");
-					break;
+			case STRING:
+				strncpy((char *)value, argv[1], config_values[i].size - 1);
+				break;
+			case INT:
+				*(int *)value = atoi(argv[1]);
+				break;
+			case UNSIGNED_LONG:
+				*(unsigned long *)value = atol(argv[1]);
+				break;
+			case SHORT:
+				*(short *)value = atoi(argv[1]);
+				break;
+			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;
+				else
+					*(int *)value = 0;
+				break;
+			default:
+				cli_print(cli, "Unknown variable type");
+				break;
 			}
 			config->reload_config = 1;
 			return CLI_OK;
@@ -1694,11 +1708,11 @@ int regular_stuff(struct cli_def *cli)
 		{
 			// Always show messages if we are doing general debug
 			if (ringbuffer->buffer[i].level == 0 && debug_flags.critical) show_message = 1;
-			if (ringbuffer->buffer[i].level == 1 && debug_flags.error) show_message = 1;
-			if (ringbuffer->buffer[i].level == 2 && debug_flags.warning) show_message = 1;
-			if (ringbuffer->buffer[i].level == 3 && debug_flags.info) show_message = 1;
-			if (ringbuffer->buffer[i].level == 4 && debug_flags.calls) show_message = 1;
-			if (ringbuffer->buffer[i].level == 5 && debug_flags.data) show_message = 1;
+			if (ringbuffer->buffer[i].level == 1 && debug_flags.error)    show_message = 1;
+			if (ringbuffer->buffer[i].level == 2 && debug_flags.warning)  show_message = 1;
+			if (ringbuffer->buffer[i].level == 3 && debug_flags.info)     show_message = 1;
+			if (ringbuffer->buffer[i].level == 4 && debug_flags.calls)    show_message = 1;
+			if (ringbuffer->buffer[i].level == 5 && debug_flags.data)     show_message = 1;
 		}
 
 		if (show_message)
@@ -1730,3 +1744,13 @@ int regular_stuff(struct cli_def *cli)
 #endif
 	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);
+}