--- libaitcli/src/aitcli.c 2010/04/24 10:05:26 1.1.1.1.2.8 +++ libaitcli/src/aitcli.c 2010/06/04 11:30:31 1.1.1.1.2.17 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.1.1.1.2.8 2010/04/24 10:05:26 misho Exp $ +* $Id: aitcli.c,v 1.1.1.1.2.17 2010/06/04 11:30:31 misho Exp $ * *************************************************************************/ #include "global.h" @@ -24,6 +24,8 @@ cliCommands_t cli_stdCmds[] = { int cli_Errno; char cli_Error[STRSIZ]; +char cli_pending_special_char; + #pragma GCC visibility pop @@ -31,28 +33,77 @@ static void cli_Null_Prep_Term(int meta) { } -static void cli_Null_Deprep_Term() +static int cli_Net_rl_GetCh(FILE *s) { -} + int ch = rl_getc(s); -static int cli_Pre_Input_Change_Mode() -{ - return 0; + if (!cli_pending_special_char && 0x1b == ch) { + cli_pending_special_char = ch; + return ch; + } + if (cli_pending_special_char && 0x5b == ch) { + cli_pending_special_char = ch; + return ch; + } + if (0x5b == cli_pending_special_char) { + cli_pending_special_char = 0; + return ch; + } + + cli_pending_special_char = 0; + fputc(ch, rl_outstream); + fflush(rl_outstream); + return ch; } -static int cli_GetC(FILE *dummy) +#if 0 +static void cli_Line_Handler(char *line) { - int ch = rl_getc(stdin); + int len; + static char cli_Buffer[BUFSIZ]; + static int cli_BufferLen, cli_BufferPos; - /* - if (is_special_char(ch)) { - pending_special_char = ch; - return '\r'; + if (!line) { // EOF + fwrite("\x4", 1, 1, rl_outstream); // ctrl+D + goto end; + } else + len = strlen(line); + if (BUFSIZ - 2 < len) + cli_BufferPos = cli_BufferLen = 0; + else { + if (BUFSIZ - 2 < len + cli_BufferLen) { + if (BUFSIZ - 2 >= cli_BufferLen - cli_BufferPos + len) { + cli_BufferLen -= cli_BufferPos; + memmove(cli_Buffer, cli_Buffer + cli_BufferPos, cli_BufferLen); + } else + cli_BufferLen = 0; + + cli_BufferPos = 0; + } + + memcpy(cli_Buffer + cli_BufferLen, line, len); + cli_BufferLen += len; + cli_Buffer[cli_BufferLen++] = '\r'; + cli_Buffer[cli_BufferLen++] = '\n'; } - */ - return ch; + fwrite(cli_Buffer, 1, cli_BufferLen, rl_outstream); + if (!cli_pending_special_char) { + fwrite("\r", 1, 1, rl_outstream); + if (*line) + add_history(line); + } + + free(line); +end: + rl_callback_handler_remove(); + if (cli_pending_special_char) { + fwrite(&cli_pending_special_char, 1, 1, rl_outstream); + cli_pending_special_char = 0; + } + fflush(rl_outstream); } +#endif // cli_GetErrno() Get error code of last operation @@ -172,18 +223,6 @@ inline int cli_WriteHistory(const char *csFile, int li } /* - * cliInit() Initialize Readline - * @csProg = program name - * return: none -*/ -inline void cliInit(const char *csProg) -{ - rl_readline_name = csProg; - - rl_variable_bind("editing-mode", "emacs"); -} - -/* * cliNetInit() Initialize Readline if CLI bind to socket * @csProg = program name * @pty = Master pty @@ -193,28 +232,34 @@ inline void cliInit(const char *csProg) void cliNetInit(const char *csProg, int pty, struct termios *term) { struct termios t; + int on = 1; - if (term) { + memset(&t, 0, sizeof t); + if (term) t = *term; - // Don`t uncomment this because input chars on CLI socket console will be hidden!!! -// t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); - t.c_iflag &= ~ICRNL; - t.c_iflag |= IGNBRK; - t.c_cc[VMIN] = 1; - t.c_cc[VTIME] = 0; - tcsetattr(pty, TCSANOW, &t); + else { + t.c_lflag = TTYDEF_LFLAG; + t.c_iflag = TTYDEF_IFLAG; + t.c_oflag = TTYDEF_OFLAG; + t.c_cflag = TTYDEF_CFLAG; + cfsetspeed(&t, B9600); } - cliInit(csProg); + t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); +// t.c_iflag &= ~(ICRNL | BRKINT | INPCK | ISTRIP | IXON); + t.c_iflag &= ~ICRNL; + t.c_iflag |= IGNBRK; + t.c_cc[VMIN] = 1; + t.c_cc[VTIME] = 0; + tcsetattr(pty, TCSANOW, &t); - rl_instream = fdopen(pty, "r"); + ioctl(pty, TIOCPKT, &on); - rl_prep_term_function = cli_Null_Prep_Term; - rl_deprep_term_function = cli_Null_Deprep_Term; - rl_pre_input_hook = cli_Pre_Input_Change_Mode; + rl_readline_name = csProg; + rl_variable_bind("editing-mode", "emacs"); - rl_getc_function = cli_GetC; - + rl_instream = fdopen(pty, "r"); + rl_outstream = NULL; } /* @@ -228,11 +273,11 @@ void cliNetInit(const char *csProg, int pty, struct te */ int cliNetExec(cliCommands_t *cmdList, const char *csPrompt, int sock, struct termios *term, struct winsize *win) { - int pty, ret = 0, r, s, alen; + int pty, ret = 0, alen, attrlen, flg; fd_set fds; struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; u_char buf[BUFSIZ]; - struct telnetAttrs *a, Attr[3]; + struct telnetAttrs *a, Attr[10]; switch (forkpty(&pty, NULL, term, win)) { case -1: @@ -241,58 +286,124 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP case 0: close(sock); - cliTTY(NULL, NULL, NULL, win); + rl_prep_term_function = cli_Null_Prep_Term; + rl_getc_function = cli_Net_rl_GetCh; + + cliNetInit(getprogname(), STDIN_FILENO, term); ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0; + /* spawn Shell mode */ + /* + execl("/bin/tcsh", "tcsh", NULL); + */ _exit(ret); default: cliNetInit(getprogname(), pty, term); - telnet_SetCmd(Attr, DO, TELOPT_TTYPE); - telnet_SetCmd(Attr + 1, DO, TELOPT_LINEMODE); - telnet_SetCmd(Attr + 2, GA, 0); - if ((ret = telnetSend(sock, Attr, 3, NULL, 0, 0)) == -1) { + /* spawn Shell mode */ + /* + telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); + telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); + telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); + telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0); + telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE); + */ + telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); + telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); + telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); + telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0); + telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE); + if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) { cli_Errno = telnet_GetErrno(); strlcpy(cli_Error, telnet_GetError(), STRSIZ); return -1; - } + } else + flg = 0; while (42) { FD_ZERO(&fds); FD_SET(sock, &fds); FD_SET(pty, &fds); - if (select(FD_SETSIZE, &fds, NULL, NULL, &tv) < 1) + if ((ret = select(FD_SETSIZE, &fds, NULL, NULL, &tv)) < 1) { + if (!ret) + cli_SetErr(ETIMEDOUT, "Client session timeout ..."); + break; + } - r = FD_ISSET(sock, &fds) ? sock : pty; - s = FD_ISSET(sock, &fds) ? pty : sock; + if (FD_ISSET(sock, &fds)) { + memset(buf, 0, BUFSIZ); + if ((ret = telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) { + if (a) + free(a); - if ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) { - if (-2 == ret) - continue; - // EOF - if (-3 == ret) - shutdown(r, SHUT_RD); - else { + if (-2 == ret) + continue; + // EOF + if (-3 == ret) + shutdown(sock, SHUT_RD); + else { + cli_Errno = telnet_GetErrno(); + strlcpy(cli_Error, telnet_GetError(), STRSIZ); + } + break; + } + if (a) + free(a); + if (alen) { + attrlen = 0; + if (1 == flg && alen) { + telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA); + telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO); + } + if (2 == flg && alen) { + telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO); + telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, + LFLOW_OFF, NULL, 0); + telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, + LFLOW_RESTART_XON, NULL, 0); + telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE); + } + if ((ret = telnetSend(sock, Attr, attrlen, buf, ret, 0)) == -1) { + cli_Errno = telnet_GetErrno(); + strlcpy(cli_Error, telnet_GetError(), STRSIZ); + break; + } + } + + if ((ret = write(pty, buf, ret)) == -1) { + LOGERR; + break; + } + } + + if (FD_ISSET(pty, &fds)) { + memset(buf, 0, BUFSIZ); + if ((ret = read(pty, buf, BUFSIZ)) < 1) { + if (!ret) + shutdown(sock, SHUT_WR); + else + LOGERR; + break; + } + attrlen = 0; + if (1 == flg && alen) { + telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA); + telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO); + } + if (2 == flg && alen) { + telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO); + telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, + LFLOW_OFF, NULL, 0); + telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, + LFLOW_RESTART_XON, NULL, 0); + telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE); + } + if ((ret = telnetSend(sock, Attr, attrlen, buf, ret, 0)) == -1) { cli_Errno = telnet_GetErrno(); strlcpy(cli_Error, telnet_GetError(), STRSIZ); + break; } - break; } - if ((ret = telnetSend(s, NULL, 0, buf, ret, 0)) == -1) { - cli_Errno = telnet_GetErrno(); - strlcpy(cli_Error, telnet_GetError(), STRSIZ); - break; - } - - /* - if ((ret = read(r, &ch, 1)) < 1) { - if (!ret) - shutdown(r, SHUT_RD); - break; - } - if (write(s, &ch, 1) == -1) - break; - */ } close(pty);