--- libaitcli/src/cli.c	2013/10/08 10:45:08	1.6.4.4
+++ libaitcli/src/cli.c	2013/10/08 11:30:00	1.6.4.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.6.4.4 2013/10/08 10:45:08 misho Exp $
+* $Id: cli.c,v 1.6.4.5 2013/10/08 11:30:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -83,7 +83,7 @@ cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch
 	cli_Printf(buf, "\n");
 	if (!args) {
 		SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
-			if (cmd->cmd_level != idx)
+			if (!(cmd->cmd_level & (1 << idx)))
 				continue;
 
 			cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help);
@@ -96,9 +96,10 @@ cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch
 				return RETCODE_OK;
 
 		SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
-			if (cmd->cmd_level != idx)
+			if (!(cmd->cmd_level & (1 << idx)))
 				continue;
-			if (args[1] && (cmd->cmd_level != idx || strcmp(args[1], cmd->cmd_name)))
+			if (args[1] && (!(cmd->cmd_level & (1 << idx)) || 
+						strcmp(args[1], cmd->cmd_name)))
 				continue;
 
 			cli_Printf(buf, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", cmd->cmd_name, 
@@ -159,7 +160,7 @@ cli_Cmd_End(void * __restrict cli_buffer, int idx, cha
 	linebuffer_t *buf = cli_buffer;
 
 	if (!idx)
-		cli_Cmd_Exit(cli_buffer, idx, args);
+		return cli_Cmd_Exit(cli_buffer, idx, args);
 
 	buf->line_level--;
 	return RETCODE_OK;
@@ -179,5 +180,22 @@ cli_Cmd_Top(void * __restrict cli_buffer, int idx, cha
 	linebuffer_t *buf = cli_buffer;
 
 	buf->line_level ^= buf->line_level;
+	return RETCODE_OK;
+}
+
+/*
+ * cli_Cmd_WhereAmI() - Builtin helper function for query level of Cli
+ *
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
+ * @args = Parsed arguments array
+ * return: RETCODE_OK ok
+*/
+int
+cli_Cmd_WhereAmI(void * __restrict cli_buffer, int idx, char ** __restrict args)
+{
+	linebuffer_t *buf = cli_buffer;
+
+	cli_Printf(buf, "Current console level is %d\n", buf->line_level);
 	return RETCODE_OK;
 }