--- libaitcli/inc/aitcli.h 2017/01/22 17:59:51 1.10.10.1 +++ libaitcli/inc/aitcli.h 2020/09/01 23:19:54 1.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.h,v 1.10.10.1 2017/01/22 17:59:51 misho Exp $ +* $Id: aitcli.h,v 1.12 2020/09/01 23:19:54 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 -Copyright 2004 - 2017 +Copyright 2004 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -205,6 +205,7 @@ typedef struct { /* Commands structure for CLI */ +#define CLI_CMD_DEFINE(x) int (x)(void *, int, char **) typedef int (*cmd_func_t)(/*linebuffer_t **/ void * __restrict cli_buffer, int idx, char ** __restrict args); struct tagCommand { @@ -229,6 +230,7 @@ typedef struct { int line_kill; char line_mode; + char line_porigin[STRSIZ]; char *line_prompt; int line_bol; @@ -349,7 +351,7 @@ unsigned int cli_telnet_GetCmd(struct telnetAttrs *att * @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 optz, ...); +int cli_telnet_SetCmd(struct telnetAttrs *attr, unsigned char cmd, int optz, ...); /* * cli_telnet_Answer() - Automatic generate commands answer to send from telnet @@ -538,6 +540,16 @@ int cliInitLine(linebuffer_t * __restrict cli_buffer); * return: NULL if error or !=NULL readed line, must be e_free after use! */ char *cliReadLine(linebuffer_t * __restrict cli_buffer, int timeout); + +/* + * cliRun() - CLI run command line + * + * @cli_buffer = CLI buffer + * @psInput = Input command line + * @prompt = Display prompt after command + * return: RETCODE_ERR error, RETCODE_OK ok +*/ +int cliRun(linebuffer_t * __restrict cli_buffer, char *psInput, int prompt); /* * cliLoop() - CLI main loop