version 1.1.1.1.2.7, 2010/04/24 10:02:33
|
version 1.1.1.1.2.15, 2010/05/20 08:18:41
|
Line 24 cliCommands_t cli_stdCmds[] = {
|
Line 24 cliCommands_t cli_stdCmds[] = {
|
int cli_Errno; |
int cli_Errno; |
char cli_Error[STRSIZ]; |
char cli_Error[STRSIZ]; |
|
|
|
char cli_pending_special_char; |
|
|
#pragma GCC visibility pop |
#pragma GCC visibility pop |
|
|
|
|
Line 31 static void cli_Null_Prep_Term(int meta)
|
Line 33 static void cli_Null_Prep_Term(int meta)
|
{ |
{ |
} |
} |
|
|
static void cli_Null_Deprep_Term() | #include <syslog.h> |
| static int cli_Net_rl_GetCh(FILE *s) |
{ |
{ |
} | int ch = rl_getc(s); |
|
|
static int cli_Pre_Input_Change_Mode() | if (!cli_pending_special_char && 0x1b == ch) { |
{ | cli_pending_special_char = ch; |
return 0; | 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; |
| } |
| |
| syslog(LOG_CRIT, "+++++ getc=%0x\n", 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 (!line) { // EOF |
if (is_special_char(ch)) { | fwrite("\x4", 1, 1, rl_outstream); // ctrl+D |
pending_special_char = ch; | goto end; |
return '\r'; | } 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 |
// cli_GetErrno() Get error code of last operation |
Line 172 inline int cli_WriteHistory(const char *csFile, int li
|
Line 225 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 |
* cliNetInit() Initialize Readline if CLI bind to socket |
* @csProg = program name |
* @csProg = program name |
* @pty = Master pty |
* @pty = Master pty |
Line 193 inline void cliInit(const char *csProg)
|
Line 234 inline void cliInit(const char *csProg)
|
void cliNetInit(const char *csProg, int pty, struct termios *term) |
void cliNetInit(const char *csProg, int pty, struct termios *term) |
{ |
{ |
struct termios t; |
struct termios t; |
|
int on = 1; |
|
|
if (term) { | memset(&t, 0, sizeof t); |
| if (term) |
t = *term; |
t = *term; |
// t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); | else { |
t.c_iflag &= ~ICRNL; | t.c_lflag = TTYDEF_LFLAG; |
t.c_iflag |= IGNBRK; | t.c_iflag = TTYDEF_IFLAG; |
t.c_cc[VMIN] = 1; | t.c_oflag = TTYDEF_OFLAG; |
t.c_cc[VTIME] = 0; | t.c_cflag = TTYDEF_CFLAG; |
tcsetattr(pty, TCSANOW, &t); | 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_readline_name = csProg; |
rl_deprep_term_function = cli_Null_Deprep_Term; | rl_variable_bind("editing-mode", "emacs"); |
rl_pre_input_hook = cli_Pre_Input_Change_Mode; | |
|
|
rl_getc_function = cli_GetC; | rl_instream = fdopen(pty, "r"); |
| rl_outstream = NULL; |
} |
} |
|
|
/* |
/* |
Line 227 void cliNetInit(const char *csProg, int pty, struct te
|
Line 275 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 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, r, s, alen, attrlen, flg; |
fd_set fds; |
fd_set fds; |
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; |
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; |
u_char buf[BUFSIZ]; |
u_char buf[BUFSIZ]; |
struct telnetAttrs *a, Attr[3]; | struct telnetAttrs *a, Attr[10]; |
|
|
switch (forkpty(&pty, NULL, term, win)) { |
switch (forkpty(&pty, NULL, term, win)) { |
case -1: |
case -1: |
Line 240 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
Line 288 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
case 0: |
case 0: |
close(sock); |
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; |
ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0; |
|
/* spawn Shell mode */ |
|
/* |
|
execl("/bin/tcsh", "tcsh", NULL); |
|
*/ |
_exit(ret); |
_exit(ret); |
default: |
default: |
|
rl_prep_term_function = cli_Null_Prep_Term; |
|
|
cliNetInit(getprogname(), pty, term); |
cliNetInit(getprogname(), pty, term); |
|
|
telnet_SetCmd(Attr, DO, TELOPT_TTYPE); | /* spawn Shell mode */ |
telnet_SetCmd(Attr + 1, DO, TELOPT_LINEMODE); | /* |
telnet_SetCmd(Attr + 2, GA, 0); | telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); |
if ((ret = telnetSend(sock, Attr, 3, NULL, 0, 0)) == -1) { | 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(); |
cli_Errno = telnet_GetErrno(); |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
return -1; |
return -1; |
} | } else |
| flg = 0; |
|
|
while (42) { |
while (42) { |
FD_ZERO(&fds); |
FD_ZERO(&fds); |
FD_SET(sock, &fds); |
FD_SET(sock, &fds); |
FD_SET(pty, &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; |
break; |
|
} |
|
|
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 ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) { |
|
if (a) |
|
free(a); |
|
|
if (-2 == ret) |
if (-2 == ret) |
continue; |
continue; |
// EOF |
// EOF |
Line 277 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
Line 352 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
} |
} |
break; |
break; |
} |
} |
if ((ret = telnetSend(s, NULL, 0, buf, ret, 0)) == -1) { | 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) { |
cli_Errno = telnet_GetErrno(); |
cli_Errno = telnet_GetErrno(); |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
break; |
break; |
} | } else |
| flg++; |
/* | |
if ((ret = read(r, &ch, 1)) < 1) { | |
if (!ret) | |
shutdown(r, SHUT_RD); | |
break; | |
} | |
if (write(s, &ch, 1) == -1) | |
break; | |
*/ | |
} |
} |
|
|
close(pty); |
close(pty); |