--- libaitcli/inc/aitcli.h	2013/08/12 09:12:04	1.6.2.1
+++ libaitcli/inc/aitcli.h	2017/01/22 17:59:51	1.10.10.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.h,v 1.6.2.1 2013/08/12 09:12:04 misho Exp $
+* $Id: aitcli.h,v 1.10.10.1 2017/01/22 17:59:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2017
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -195,7 +195,7 @@ typedef TAILQ_HEAD(tqHistoryHead, tagHistory) history_
 
 /* Bind keys structure types */
 
-typedef int (*bindkey_func_t)(int idx, /*linebuffer_t **/ void * __restrict cli_buffer);
+typedef int (*bindkey_func_t)(int idx, /* linebuffer_t * */ void * __restrict cli_buffer);
 typedef struct {
 	int		key_len;
 	unsigned char	key_ch[8];
@@ -226,6 +226,7 @@ typedef SLIST_HEAD(slCommandHead, tagCommand) commands
 /* Main structure, Buffer for CLI work with thread models ;-) special designed by M.Punov */
 
 typedef struct {
+	int			line_kill;
 	char			line_mode;
 
 	char			*line_prompt;
@@ -342,13 +343,13 @@ unsigned int cli_telnet_GetCmd(struct telnetAttrs *att
  *
  * @attr = input attribute
  * @cmd = command
- * @opt = option, if 0xff not specified
+ * @optz = option, if 0xff not specified
  * @arg1 = sub-option code, if 0xff not specified
  * @arg2 = sub-option data, if NULL not specified
  * @arg3 = sub-option data size, if 0 not specified data
  * return: -1 can`t set command; !=-1 ok
 */
-int cli_telnet_SetCmd(struct telnetAttrs *attr, unsigned char cmd, unsigned char opt, ...);
+int cli_telnet_SetCmd(struct telnetAttrs *attr, unsigned char cmd, unsigned char optz, ...);
 
 /*
  * cli_telnet_Answer() - Automatic generate commands answer to send from telnet
@@ -379,7 +380,7 @@ int cli_telnet_Answer(unsigned char *caps, int nCaps, 
  * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands
  *
  * @cli_buffer = CLI buffer
- * @idx = Selected command ID
+ * @idx = Config level
  * @args = Parsed arguments array
  * return: RETCODE_OK ok
 */
@@ -403,7 +404,7 @@ int cli_BindKey(bindkey_t * __restrict key, linebuffer
  *
  * @cli_buffer = CLI buffer
  * @csCmd = Command name
- * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
+ * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
@@ -418,7 +419,7 @@ cli_addCommand(linebuffer_t * __restrict cli_buffer, c
  *
  * @cli_buffer = CLI buffer
  * @csCmd = Command name
- * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
+ * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
@@ -428,7 +429,7 @@ cli_delCommand(linebuffer_t * __restrict cli_buffer, c
  *
  * @cli_buffer = CLI buffer
  * @csCmd = Command name
- * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
+ * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
@@ -533,29 +534,32 @@ int cliInitLine(linebuffer_t * __restrict cli_buffer);
  * cliReadLine() - Read line from opened CLI session
  *
  * @cli_buffer = CLI buffer
+ * @timeout = Session timeout (-1 infinit)
  * return: NULL if error or !=NULL readed line, must be e_free after use!
 */
-char *cliReadLine(linebuffer_t * __restrict cli_buffer);
+char *cliReadLine(linebuffer_t * __restrict cli_buffer, int timeout);
 
 /*
  * cliLoop() - CLI main loop
  *
  * @cli_buffer = CLI buffer
  * @csHistFile = History file name
+ * @timeout = Session timeout (-1 infinit)
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
-int cliLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile);
+int cliLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, int timeout);
 /*
  * cliNetLoop() - CLI network main loop binded to socket
  *
  * @cli_buffer = CLI buffer
  * @csHistFile = History file name
  * @sock = client socket
- * @term = stdin termios
- * @win = window size of tty
+ * @timeout = Session timeout (-1 infinit)
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
-int cliNetLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, int sock);
+int cliNetLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, 
+		int sock, int timeout);
+#define cliKillLoop(_x)	(assert((_x)), (_x)->line_kill = 1)
 
 
 #endif