version 1.1.1.1.2.12, 2010/04/28 15:27:55
|
version 1.1.1.1.2.13, 2010/05/03 08:10:05
|
Line 203 void cliNetInit(const char *csProg, int pty, struct te
|
Line 203 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, attrlen; | 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[10]; |
struct telnetAttrs *a, Attr[10]; |
register int i; |
|
|
|
switch (forkpty(&pty, NULL, term, win)) { |
switch (forkpty(&pty, NULL, term, win)) { |
case -1: |
case -1: |
Line 227 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
Line 226 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
execl("/bin/tcsh", "tcsh", NULL); |
execl("/bin/tcsh", "tcsh", NULL); |
_exit(ret); |
_exit(ret); |
default: |
default: |
telnet_SetCmd(Attr, DO, TELOPT_TTYPE); | telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); |
telnet_SetCmd(Attr + 1, DO, TELOPT_LFLOW); | telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); |
telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); | telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0); |
telnet_SetCmd(Attr + 3, DO, TELOPT_BINARY); | telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); |
telnet_SetCmd(Attr + 4, DO, TELOPT_NAWS); | telnet_SetCmd(Attr + 4, DONT, TELOPT_LINEMODE); |
telnet_SetCmd(Attr + 5, DO, TELOPT_STATUS); | if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) { |
telnet_SetCmd(Attr + 6, DONT, TELOPT_ECHO); | |
#ifdef TELNET_LINEMODE_ENABLE | |
telnet_SetCmd(Attr + 7, DO, TELOPT_LINEMODE); | |
telnet_Set_SubOpt(Attr + 8, TELOPT_LINEMODE, LM_MODE, "\x0", 1); | |
if ((ret = telnetSend(sock, Attr, 9, NULL, 0, 0)) == -1) { | |
#else | |
if ((ret = telnetSend(sock, Attr, 7, NULL, 0, 0)) == -1) { | |
#endif | |
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); |
Line 275 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
Line 267 int cliNetExec(cliCommands_t *cmdList, const char *csP
|
} |
} |
break; |
break; |
} |
} |
for (attrlen = i = 0; i < alen; i++) { | attrlen = 0; |
if (TELOPT_TTYPE == a[i].ta_opt && WILL == a[i].ta_cmd) | if (1 == flg && alen) { |
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_TTYPE, TELQUAL_SEND, NULL, 0); | telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA); |
#ifdef TELNET_LINEMODE_ENABLE | telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO); |
if (TELOPT_LINEMODE == a[i].ta_cmd && SB == a[i].ta_cmd) { | |
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LINEMODE, LM_SLC, | |
"\x1\x0\x0\x3\xe2\x3\x4\x0\x0\x5\x0\x0\x7\xe2\x1c" | |
"\x8\x82\x4\x9\x0\x0\xa\x82\x7f\xb\x82\x15\xc\x82\x17" | |
"\xd\x82\x12\xe\x82\x16\xf\x82\x11\x10\x82\x13", 42); | |
} | |
#endif | |
} |
} |
|
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 (s == sock && ret > 2 && 0x1b == buf[0] && 0x5b == buf[1]) { | if (s == pty && ret > 2 && 0x1b == buf[0] && 0x5b == buf[1]) { |
memmove(buf, buf + 3, ret); |
memmove(buf, buf + 3, ret); |
ret -= 3; |
ret -= 3; |
} | }*/ |
*/ | |
#include "syslog.h" | |
int j; | |
for (j = 0; j < ret; j++) | |
syslog(LOG_CRIT, "prepare to send %d = %X", j, buf[j]); | |
syslog(LOG_CRIT, "send packet %d === %s ========", ret, r == pty ? "pty -> sock" : "sock -> pty"); | |
if ((ret = telnetSend(s, Attr, attrlen, buf, ret, 0)) == -1) { |
if ((ret = telnetSend(s, Attr, 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 = read(r, &ch, 1)) < 1) { |