--- libaitcli/src/cli.c	2013/05/30 09:16:42	1.5
+++ libaitcli/src/cli.c	2013/10/08 12:11:49	1.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.5 2013/05/30 09:16:42 misho Exp $
+* $Id: cli.c,v 1.8 2013/10/08 12:11:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,39 +49,45 @@ SUCH DAMAGE.
 /*
  * cli_Cmd_Exit() - Builtin helper function for Exit from Cli
  *
- * @buffer = CLI buffer
- * @idx = Selected command ID
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
  * @args = Parsed arguments array
  * return: RETCODE_EOF exit from Cli!
 */
-int cli_Cmd_Exit(void * __restrict buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
-	cli_Printf(buffer, "\n");
+	cli_Printf(cli_buffer, "\n");
 	return RETCODE_EOF;
 }
 
 /*
  * cli_Cmd_Help() - Builtin helper function for Help screen
  *
- * @buffer = CLI buffer
- * @idx = Selected command ID
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
  * @args = Parsed arguments array
  * return: RETCODE_ERR in error or RETCODE_OK
 */
-int cli_Cmd_Help(void * __restrict buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
-	linebuffer_t *buf = buffer;
+	linebuffer_t *buf = cli_buffer;
 	struct tagCommand *cmd;
 
-	if (!buffer) {
+	if (!cli_buffer) {
 		cli_SetErr(EINVAL, "Invalid input parameters ...");
 		return RETCODE_ERR;
 	}
 
 	cli_Printf(buf, "\n");
 	if (!args) {
-		SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next)
+		SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
+			if (!(cmd->cmd_level & (1 << idx)))
+				continue;
+
 			cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help);
+		}
 	} else {
 		if (!args[1])
 			cli_Printf(buf, "Help screen::\n");
@@ -90,14 +96,17 @@ int cli_Cmd_Help(void * __restrict buffer, int idx, ch
 				return RETCODE_OK;
 
 		SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
-			if (args[1] && (cmd->cmd_level != buf->line_level || strcmp(args[1], cmd->cmd_name)))
+			if (!(cmd->cmd_level & (1 << idx)))
 				continue;
+			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, 
 					args[1] ? cmd->cmd_info: cmd->cmd_help);
 		}
 	}
-	cli_Printf(buffer, "\r");
+	cli_Printf(cli_buffer, "\r");
 
 	return RETCODE_OK;
 }
@@ -105,13 +114,91 @@ int cli_Cmd_Help(void * __restrict buffer, int idx, ch
 /*
  * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands
  *
- * @buffer = CLI buffer
- * @idx = Selected command ID
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
  * @args = Parsed arguments array
  * return: RETCODE_OK ok
 */
-int cli_Cmd_Unsupported(void * __restrict buffer, int idx, char ** __restrict args)
+int
+cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {
-	cli_Printf(buffer, "Command %s not supported in this version ...\n", args[0]);
+	cli_Printf(cli_buffer, "Command %s not supported in this version ...\n", args[0]);
+	return RETCODE_OK;
+}
+
+/*
+ * cli_Cmd_Config() - Builtin helper function for enter into config level from Cli
+ *
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
+ * @args = Parsed arguments array
+ * return: RETCODE_ERR in error or RETCODE_OK
+*/
+int
+cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)
+{
+	linebuffer_t *buf = cli_buffer;
+
+	if (idx == sizeof idx * 8 - 1)
+		return RETCODE_ERR;
+
+	buf->line_level++;
+	cli_Printf(buf, "Enter to config level %d\n", buf->line_level);
+	return RETCODE_OK;
+}
+
+/*
+ * cli_Cmd_End() - Builtin helper function for end config level from Cli
+ *
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
+ * @args = Parsed arguments array
+ * return: RETCODE_EOF in level 0 or RETCODE_OK
+*/
+int
+cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)
+{
+	linebuffer_t *buf = cli_buffer;
+
+	if (!idx)
+		return cli_Cmd_Exit(cli_buffer, idx, args);
+
+	buf->line_level--;
+	cli_Printf(buf, "Enter to config level %d\n", buf->line_level);
+	return RETCODE_OK;
+}
+
+/*
+ * cli_Cmd_Top() - Builtin helper function for top level of Cli
+ *
+ * @cli_buffer = CLI buffer
+ * @idx = Config level
+ * @args = Parsed arguments array
+ * return: RETCODE_OK ok
+*/
+int
+cli_Cmd_Top(void * __restrict cli_buffer, int idx, char ** __restrict args)
+{
+	linebuffer_t *buf = cli_buffer;
+
+	buf->line_level ^= buf->line_level;
+	cli_Printf(buf, "Enter to top config level %d\n", 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 config level is %d\n", buf->line_level);
 	return RETCODE_OK;
 }