version 1.2.2.16, 2010/06/08 12:06:47
|
version 1.2.2.19, 2010/12/07 15:15:34
|
Line 906 cliInit(int fin, int fout, const char *prompt)
|
Line 906 cliInit(int fin, int fout, const char *prompt)
|
linebuffer_t *buffer; |
linebuffer_t *buffer; |
bindkey_t *keys; |
bindkey_t *keys; |
register int i; |
register int i; |
struct termios t; |
|
|
|
memset(&t, 0, sizeof t); |
|
/* init buffer */ |
/* init buffer */ |
buffer = malloc(sizeof (linebuffer_t)); | buffer = malloc(sizeof(linebuffer_t)); |
if (!buffer) { |
if (!buffer) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 1148 cliInit(int fin, int fout, const char *prompt)
|
Line 1146 cliInit(int fin, int fout, const char *prompt)
|
memcpy(keys[i].key_ch, K_F12, keys[i].key_len); |
memcpy(keys[i].key_ch, K_F12, keys[i].key_len); |
i++; |
i++; |
|
|
|
buffer->line_keys = keys; |
|
return buffer; |
|
} |
|
|
|
/* |
|
* cliInitLine() Init CLI input line terminal |
|
* @buffer = CLI buffer |
|
* return: none |
|
*/ |
|
int |
|
cliInitLine(linebuffer_t * __restrict buffer) |
|
{ |
|
struct termios t; |
|
|
|
memset(&t, 0, sizeof t); |
tcgetattr(buffer->line_in, &t); |
tcgetattr(buffer->line_in, &t); |
t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); |
t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); |
t.c_iflag |= IGNBRK; |
t.c_iflag |= IGNBRK; |
t.c_cc[VMIN] = 1; |
t.c_cc[VMIN] = 1; |
t.c_cc[VTIME] = 0; |
t.c_cc[VTIME] = 0; |
tcsetattr(buffer->line_in, TCSANOW, &t); | return tcsetattr(buffer->line_in, TCSANOW, &t); |
| |
buffer->line_keys = keys; | |
return buffer; | |
} |
} |
|
|
/* |
/* |
Line 1238 recheck:
|
Line 1248 recheck:
|
* @buffer = CLI buffer |
* @buffer = CLI buffer |
* @csHistFile = History file name |
* @csHistFile = History file name |
* @sock = client socket |
* @sock = client socket |
* @term = stdin termios |
|
* @win = window size of tty |
|
* return: RETCODE_ERR error, RETCODE_OK ok |
* return: RETCODE_ERR error, RETCODE_OK ok |
*/ |
*/ |
int |
int |
cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock, | cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock) |
struct termios *term, struct winsize *win) | |
{ |
{ |
u_char buf[BUFSIZ]; |
u_char buf[BUFSIZ]; |
int pty, r, s, alen, attrlen, flg, ret = 0; | int pty, r, s, alen, flg, attrlen = 0, ret = 0; |
fd_set fds; |
fd_set fds; |
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; |
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; |
struct telnetAttrs *a, Attr[10]; |
struct telnetAttrs *a, Attr[10]; |
|
|
switch (forkpty(&pty, NULL, term, win)) { | switch (forkpty(&pty, NULL, NULL, NULL)) { |
case -1: |
case -1: |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
case 0: |
case 0: |
close(sock); | if (!buffer) { |
| |
if (buffer) | |
ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0; | |
else | |
cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); |
cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); |
|
return -1; |
|
} else |
|
close(sock); |
|
|
/* spawn Shell mode */ | ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0; |
//execl("/bin/tcsh", "tcsh", NULL); | cliEnd(buffer); |
|
|
_exit(ret); | exit(ret); |
default: |
default: |
telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); |
telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); |
telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); |
telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); |
Line 1295 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
Line 1301 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
r = FD_ISSET(sock, &fds) ? sock : pty; |
r = FD_ISSET(sock, &fds) ? sock : pty; |
s = FD_ISSET(sock, &fds) ? pty : sock; |
s = FD_ISSET(sock, &fds) ? pty : sock; |
|
|
if ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) { | if (FD_ISSET(sock, &fds)) { |
| memset(buf, 0, BUFSIZ); |
| if ((ret = telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) { |
| if (a) |
| free(a); |
| |
| if (-2 == ret) |
| continue; |
| // EOF |
| if (-3 == ret) |
| shutdown(sock, SHUT_RD); |
| else { |
| cli_Errno = telnet_GetErrno(); |
| strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
| } |
| 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 (a) |
if (a) |
free(a); |
free(a); |
|
|
if (-2 == ret) | if ((ret = write(pty, buf, ret)) == -1) { |
continue; | LOGERR; |
// EOF | break; |
if (-3 == ret) | |
shutdown(r, SHUT_RD); | |
else { | |
cli_Errno = telnet_GetErrno(); | |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); | |
} |
} |
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 (a) |
|
free(a); |
|
|
|
if ((ret = telnetSend(s, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) { | if (FD_ISSET(pty, &fds)) { |
cli_Errno = telnet_GetErrno(); | memset(buf, 0, BUFSIZ); |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); | if ((ret = read(pty, buf, BUFSIZ)) == -1) { |
break; | LOGERR; |
} else | break; |
flg++; | } |
| |
| if ((ret = telnetSend(sock, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) { |
| cli_Errno = telnet_GetErrno(); |
| strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
| break; |
| } else |
| flg++; |
| } |
} |
} |
|
|
close(pty); |
close(pty); |
Line 1355 cliLoop(linebuffer_t * __restrict buffer, const char *
|
Line 1377 cliLoop(linebuffer_t * __restrict buffer, const char *
|
struct tagCommand *cmd; |
struct tagCommand *cmd; |
|
|
/* --- main body of CLI --- */ |
/* --- main body of CLI --- */ |
|
cliInitLine(buffer); |
|
|
if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR) |
if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR) |
return RETCODE_ERR; |
return RETCODE_ERR; |