X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/b5273cc1c65f9496c1a7c2135b61979dd98fcf08..dac7fe82bb8d933fb3a68cb9c0256dac6f4470ae:/cli.c?ds=sidebyside

diff --git a/cli.c b/cli.c
index 65afb43..876ad06 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;
@@ -77,62 +75,61 @@ static char *debug_levels[] = {
 
 #endif
 
-static int cmd_show_session(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);
-static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
-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 cmd_show_session(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_group(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_tunnels(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_users(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_radius(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_version(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_pool(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_run(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_banana(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_plugins(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_write_memory(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_drop_user(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_drop_tunnel(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_drop_session(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_snoop(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_snoop(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_debug(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_debug(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_set(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_load_plugin(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_remove_plugin(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_uptime(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_shutdown(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_reload(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_setforward(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_rmtlnsconf(struct cli_def *cli, const char *command, char **argv, int argc);
 
 static int regular_stuff(struct cli_def *cli);
 
 #ifdef STATISTICS
-static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_show_counters(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_clear_counters(struct cli_def *cli, const char *command, char **argv, int argc);
 #endif /* STATISTICS */
 
 #ifdef BGP
 #define MODE_CONFIG_BGP 8
-static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_router_bgp(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_router_bgp_neighbour(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_router_bgp_no_neighbour(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_bgp(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_suspend_bgp(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_suspend_bgp(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_restart_bgp(struct cli_def *cli, const char *command, char **argv, int argc);
 #endif /* BGP */
 
 #define MODE_CONFIG_NACL 9
-static int cmd_ip_access_list(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_ip_access_list(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int argc);
-static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_ip_access_list(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_ip_access_list(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_ip_access_list_rule(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_filter(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_no_filter(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_access_list(struct cli_def *cli, const char *command, char **argv, int argc);
 
 /* match if b is a substr of a */
 #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
@@ -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");
@@ -363,7 +357,7 @@ void cli_do(int sockfd)
 	exit(0);
 }
 
-static void cli_print_log(struct cli_def *cli, char *string)
+static void cli_print_log(struct cli_def *cli, const char *string)
 {
 	LOG(3, 0, 0, "%s\n", string);
 }
@@ -412,7 +406,7 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...)
 	return CLI_OK;
 }
 
-static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_session(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -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,18 +578,14 @@ 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 : "*");
 	}
 	return CLI_OK;
 }
 
-static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_tunnels(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i, x, show_all = 0;
 	char *states[] = {
@@ -695,18 +669,14 @@ 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
 				);
 	}
 
 	return CLI_OK;
 }
 
-static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_users(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	char sid[32][8];
 	char *sargv[32];
@@ -748,7 +718,7 @@ static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int a
 }
 
 #ifdef STATISTICS
-static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_counters(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -763,7 +733,7 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 			GET_STAT(tun_tx_bytes),
 			GET_STAT(tun_tx_packets),
 			GET_STAT(tun_tx_errors));
-	cli_print(cli, "");
+	cli_print(cli, " ");
 
 	cli_print(cli, "%-10s %10s %10s %10s %10s", "Tunnel", "Bytes", "Packets", "Errors", "Retries");
 	cli_print(cli, "%-10s %10u %10u %10u", "RX",
@@ -775,7 +745,7 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 			GET_STAT(tunnel_tx_packets),
 			GET_STAT(tunnel_tx_errors),
 			GET_STAT(tunnel_retries));
-	cli_print(cli, "");
+	cli_print(cli, " ");
 
 	cli_print(cli, "%-30s%-10s", "Counter", "Value");
 	cli_print(cli, "-----------------------------------------");
@@ -841,14 +811,14 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in
 		char *p = strchr(t, '\n');
 		if (p) *p = 0;
 
-		cli_print(cli, "");
+		cli_print(cli, " ");
 		cli_print(cli, "Last counter reset %s", t);
 	}
 
 	return CLI_OK;
 }
 
-static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_clear_counters(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -861,7 +831,7 @@ static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, i
 }
 #endif /* STATISTICS */
 
-static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_version(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -870,7 +840,7 @@ static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_pool(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	int used = 0, free = 0, show_all = 0;
@@ -932,13 +902,13 @@ static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int ar
 }
 
 static FILE *save_config_fh = 0;
-static void print_save_config(struct cli_def *cli, char *string)
+static void print_save_config(struct cli_def *cli, const char *string)
 {
 	if (save_config_fh)
 		fprintf(save_config_fh, "%s\n", string);
 }
 
-static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_write_memory(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -961,7 +931,7 @@ static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int
 
 static char const *show_access_list_rule(int extended, ip_filter_rulet *rule);
 
-static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_run(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	char ipv6addr[INET6_ADDRSTRLEN];
@@ -1058,7 +1028,7 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_radius(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i, free = 0, used = 0, show_all = 0;
 	char *states[] = {
@@ -1113,7 +1083,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_plugins(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1128,7 +1098,7 @@ static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_throttle(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1160,7 +1130,7 @@ static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, in
 	return CLI_OK;
 }
 
-static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_banana(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -1183,7 +1153,7 @@ static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_drop_user(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	sessionidt s;
@@ -1224,7 +1194,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar
 	return CLI_OK;
 }
 
-static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_drop_tunnel(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	tunnelidt t;
@@ -1274,7 +1244,7 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_drop_session(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	sessionidt s;
@@ -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);
@@ -1326,7 +1294,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_snoop(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	in_addr_t ip;
 	uint16_t port;
@@ -1399,7 +1367,7 @@ static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
 	return CLI_OK;
 }
 
-static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_snoop(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	sessionidt s;
@@ -1437,7 +1405,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_throttle(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int rate_in = 0;
 	int rate_out = 0;
@@ -1565,7 +1533,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_throttle(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	sessionidt s;
@@ -1610,7 +1578,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_debug(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1674,7 +1642,7 @@ static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)
 	return CLI_OK;
 }
 
-static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_debug(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1720,7 +1688,7 @@ static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_load_plugin(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i, firstfree = 0;
 
@@ -1755,7 +1723,7 @@ static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_remove_plugin(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1816,7 +1784,7 @@ static char *duration(time_t secs)
 	return buf;
 }
 
-static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_uptime(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	FILE *fh;
 	char buf[100], *p = buf, *loads[3];
@@ -1826,7 +1794,7 @@ static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
 		return CLI_HELP_NO_ARGS;
 
 	fh = fopen("/proc/loadavg", "r");
-	fgets(buf, 100, fh);
+	p = fgets(buf, 100, fh);
 	fclose(fh);
 
 	for (i = 0; i < 3; i++)
@@ -1852,7 +1820,7 @@ static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
 	return CLI_OK;
 }
 
-static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_set(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -1981,7 +1949,7 @@ int regular_stuff(struct cli_def *cli)
 }
 
 #ifdef BGP
-static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_router_bgp(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int as;
 
@@ -2047,7 +2015,7 @@ static int find_bgp_neighbour(char const *name)
 	return new;
 }
 
-static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_router_bgp_neighbour(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	int keepalive;
@@ -2191,7 +2159,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
 	return CLI_OK;
 }
 
-static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_router_bgp_no_neighbour(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -2223,7 +2191,7 @@ static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char
 	return CLI_OK;
 }
 
-static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_bgp(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	int hdr = 0;
@@ -2255,7 +2223,7 @@ static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int arg
 
 		if (!hdr++)
 		{
-			cli_print(cli, "");
+			cli_print(cli, " ");
 			cli_print(cli, "Peer                  AS         Address "
 			    "State       Retries Retry in Route Pend    Timers");
 			cli_print(cli, "------------------ ----- --------------- "
@@ -2278,7 +2246,7 @@ static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_suspend_bgp(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	char *addr;
@@ -2311,7 +2279,7 @@ static int cmd_suspend_bgp(struct cli_def *cli, char *command, char **argv, int
 	return CLI_OK;
 }
 
-static int cmd_no_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_suspend_bgp(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	char *addr;
@@ -2345,7 +2313,7 @@ static int cmd_no_suspend_bgp(struct cli_def *cli, char *command, char **argv, i
 	return CLI_OK;
 }
 
-static int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_restart_bgp(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	char *addr;
@@ -2473,12 +2441,12 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add)
 	return CLI_OK;
 }
 
-static int cmd_ip_access_list(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_ip_access_list(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	return access_list(cli, argv, argc, 1);
 }
 
-static int cmd_no_ip_access_list(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_ip_access_list(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	return access_list(cli, argv, argc, 0);
 }
@@ -2564,7 +2532,7 @@ static char const *show_access_list_rule(int extended, ip_filter_rulet *rule)
 	return buf;
 }
 
-static ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char **argv, int argc)
+static ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	static ip_filter_rulet rule;
 	struct in_addr addr;
@@ -2799,7 +2767,7 @@ static ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command,
 	return &rule;
 }
 
-static ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char **argv, int argc)
+static ip_filter_rulet *access_list_rule_std(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	static ip_filter_rulet rule;
 	struct in_addr addr;
@@ -2915,7 +2883,7 @@ static ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command,
 	return &rule;
 }
 
-static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_ip_access_list_rule(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	ip_filter_rulet *rule = ip_filters[filt].extended
@@ -2941,7 +2909,7 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar
 	return CLI_OK;
 }
 
-static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_filter(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	sessionidt s;
 	int i;
@@ -3037,7 +3005,7 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc)
 	return CLI_OK;
 }
 
-static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_no_filter(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 	sessionidt s;
@@ -3082,7 +3050,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar
 	return CLI_OK;
 }
 
-static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_access_list(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int i;
 
@@ -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",
@@ -3127,7 +3095,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 	return CLI_OK;
 }
 
-static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_shutdown(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -3136,7 +3104,7 @@ static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int arg
 	return CLI_OK;
 }
 
-static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_reload(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
 		return CLI_HELP_NO_ARGS;
@@ -3145,9 +3113,78 @@ 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, const 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);
 
-static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc)
+	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, const char *command, char **argv, int argc)
 {
 	int ret;
 
@@ -3197,7 +3234,7 @@ static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int a
 	return CLI_OK;
 }
 
-static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc)
+static int cmd_show_rmtlnsconf(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	confrlnsidt idrlns;
 	char strdisp[1024];
@@ -3217,4 +3254,3 @@ static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv,
 
 	return CLI_OK;
 }
-#endif