X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/b5273cc1c65f9496c1a7c2135b61979dd98fcf08..916c13c6039bd189873ee094e9c0ebd010899792:/cli.c

diff --git a/cli.c b/cli.c
index 65afb43..e5ac57c 100644
--- a/cli.c
+++ b/cli.c
@@ -32,9 +32,7 @@
 #ifdef BGP
 #include "bgp.h"
 #endif
-#ifdef LAC
 #include "l2tplac.h"
-#endif
 
 extern tunnelt *tunnel;
 extern bundlet *bundle;
@@ -78,6 +76,7 @@ static char *debug_levels[] = {
 #endif
 
 static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_show_group(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc);
@@ -103,10 +102,8 @@ 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 cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc);
-#ifdef LAC
 static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc);
-#endif
 
 static int regular_stuff(struct cli_def *cli);
 
@@ -157,10 +154,9 @@ void init_cli()
 	cli_register_command(cli, c, "pool", cmd_show_pool, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the IP address allocation pool");
 	cli_register_command(cli, c, "radius", cmd_show_radius, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show active radius queries");
 	cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show the currently running configuration");
-#ifdef LAC
 	cli_register_command(cli, c, "remotelns-conf", cmd_show_rmtlnsconf, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show a list of remote LNS configuration");
-#endif
 	cli_register_command(cli, c, "session", cmd_show_session, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of sessions or details for a single session");
+	cli_register_command(cli, c, "group", cmd_show_group, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of groups or details for a single group");
 	cli_register_command(cli, c, "tbf", cmd_show_tbf, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all token bucket filters in use");
 	cli_register_command(cli, c, "throttle", cmd_show_throttle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all throttled sessions and associated TBFs");
 	cli_register_command(cli, c, "tunnels", cmd_show_tunnels, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of tunnels or details for a single tunnel");
@@ -232,9 +228,7 @@ void init_cli()
 
 	cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set a configuration variable");
 
-#ifdef LAC
 	cli_register_command(cli, NULL, "setforward", cmd_setforward, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set the Remote LNS Forward");
-#endif
 
 	c = cli_register_command(cli, NULL, "ip", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG, NULL);
 	cli_register_command(cli, c, "access-list", cmd_ip_access_list, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Add named access-list");
@@ -543,15 +537,9 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 	}
 
 	// Show Summary
-#ifdef LAC
 	cli_print(cli, "%5s %7s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-18s %s",
-#else
-	cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-15s %s",
-#endif
 			"SID",
-#ifdef LAC
 			"LkToSID",
-#endif
 			"TID",
 			"Username",
 			"IP",
@@ -564,11 +552,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			"uploaded",
 			"idle",
 			"Rem.Time",
-#ifdef LAC
 			"LAC(L)/RLNS(R)/PPPOE(P)",
-#else
-			"LAC(L)/PPPOE(P)",
-#endif
 			"CLI");
 
 	for (i = 1; i < MAXSESSION; i++)
@@ -579,15 +563,9 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 			rem_time = session[i].timeout ? (session[i].timeout - bundle[session[i].bundle].online_time) : 0;
 		else
 			rem_time = session[i].timeout ? (session[i].timeout - (time_now-session[i].opened)) : 0;
-#ifdef LAC
 		cli_print(cli, "%5d %7d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
-#else
-		cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
-#endif
 				i,
-#ifdef LAC
 				session[i].forwardtosession,
-#endif
 				session[i].tunnel,
 				session[i].user[0] ? session[i].user : "*",
 				fmtaddr(htonl(session[i].ip), 0),
@@ -600,11 +578,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
 				(unsigned long)session[i].cin,
 				abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
 				(unsigned long)(rem_time),
-#ifdef LAC
 				(session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":(tunnel[session[i].tunnel].isremotelns?"(R)":"(L)"),
-#else
-				(session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":"(L)",
-#endif
 				(session[i].tunnel == TUNNEL_ID_PPPOE)?fmtMacAddr(session[i].src_hwaddr):fmtaddr(htonl(tunnel[session[i].tunnel].ip), 1),
 				session[i].calling[0] ? session[i].calling : "*");
 	}
@@ -695,11 +669,7 @@ static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int
 				fmtaddr(htonl(tunnel[i].ip), 0),
 				states[tunnel[i].state],
 				sessions
-#ifdef LAC
 				,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":(tunnel[i].isremotelns?"Tunnel To Remote LNS":"Tunnel To LAC")
-#else
-				,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":"Tunnel To LAC"
-#endif
 				);
 	}
 
@@ -1310,13 +1280,11 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 			cli_print(cli, "Dropping session %d", s);
 			cli_session_actions[s].action |= CLI_SESS_KILL;
 		}
-#ifdef LAC
 		else if (session[s].forwardtosession && session[s].opened && !session[s].die)
 		{
 			cli_print(cli, "Dropping session %d", s);
 			cli_session_actions[s].action |= CLI_SESS_KILL;
 		}
-#endif
 		else
 		{
 			cli_error(cli, "Session %d is not active.", s);
@@ -3107,7 +3075,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 		}
 
 		if (i)
-			cli_print(cli, "");
+			cli_print(cli, " ");
 
 		cli_print(cli, "%s IP access list %s",
 			ip_filters[f].extended ? "Extended" : "Standard",
@@ -3145,7 +3113,76 @@ static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc)
 	return CLI_OK;
 }
 
-#ifdef LAC
+static int cmd_show_group(struct cli_def *cli, char *command, char **argv, int argc)
+{
+	int i;
+	groupidt g;
+
+	if (CLI_HELP_REQUESTED)
+		return cli_arg_help(cli, 1,
+			"<1-%d>", MAXGROUPE-1, "Show specific group by id",
+			NULL);
+
+	time(&time_now);
+	if (argc > 0)
+	{
+		// Show individual group
+		for (i = 0; i < argc; i++)
+		{
+			sessionidt s;
+
+			g = atoi(argv[i]);
+			if (g <= 0 || g >= MAXGROUPE)
+			{
+				cli_print(cli, "Invalid group id \"%s\"", argv[i]);
+				continue;
+			}
+
+			cli_print(cli, "\r\nGroup %d:", g);
+			cli_print(cli, "\tNb Session:\t\t%d", grpsession[g].nbsession);
+			cli_print(cli, "\tNb Routes:\t\t%d", grpsession[g].nbroutesgrp);
+			cli_print(cli, "\ttime_changed:\t\t%d\n", grpsession[g].time_changed);
+
+			for (i = 0; i < grpsession[g].nbsession; i++)
+			{
+				if ((s = grpsession[g].sesslist[i].sid))
+				{
+					cli_print(cli, "\tSession:\t%d\tTx Rate:%d Kbps\t\t\tweight:\t%d",
+								s,
+								grpsession[g].sesslist[i].tx_rate/(1024/8),
+								grpsession[g].sesslist[i].weight);
+				}
+			}
+
+			for (i = 0; i < grpsession[g].nbroutesgrp; i++)
+			{
+				if (grpsession[g].route[i].ip != 0)
+				{
+					cli_print(cli, "\tRoute:\t%s/%d", fmtaddr(htonl(grpsession[g].route[i].ip), 0), grpsession[g].route[i].prefixlen);
+				}
+			}
+		}
+		return CLI_OK;
+	}
+
+	// Show Summary
+	cli_print(cli, "%5s %7s %9s %12s",
+			"GID",
+			"Nb Sess",
+			"Nb Routes",
+			"Time changed");
+
+	for (g = gnextgrpid; g != 0; g = grpsession[g].prev)
+	{
+		cli_print(cli, "%5d %7d %9d %12d",
+					g,
+					grpsession[g].nbsession,
+					grpsession[g].nbroutesgrp,
+					grpsession[g].time_changed);
+	}
+
+	return CLI_OK;
+}
 
 static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc)
 {
@@ -3217,4 +3254,3 @@ static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv,
 
 	return CLI_OK;
 }
-#endif