libaitcli/src/aitcli.c - diff

Return to aitcli.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitcli / src

Diff for /libaitcli/src/aitcli.c between versions 1.1.1.1.2.11 and 1.1.1.1.2.14

version 1.1.1.1.2.11, 2010/04/28 13:54:45	version 1.1.1.1.2.14, 2010/05/03 08:28:35
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[5];	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 217 int cliNetExec(cliCommands_t cmdList, const char csP	Line 216 int cliNetExec(cliCommands_t cmdList, const char csP
case 0:	case 0:
close(sock);	close(sock);

// rl_prep_term_function = cli_Null_Prep_Term;	#ifdef NULL_PREP_TERM
	rl_prep_term_function = cli_Null_Prep_Term;
	#endif

cliNetInit(getprogname(), STDIN_FILENO, term);	cliNetInit(getprogname(), STDIN_FILENO, term);
cliTTY(NULL, NULL, NULL, win);	cliTTY(NULL, NULL, NULL, win);
Line 225 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, WILL, TELOPT_SGA);	telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
telnet_SetCmd(Attr + 2, DO, TELOPT_LFLOW);	telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
telnet_SetCmd(Attr + 3, DO, TELOPT_LINEMODE);	telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
telnet_Set_SubOpt(Attr + 4, TELOPT_LINEMODE, LM_MODE, "\x0", 1);	telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) {	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);
Line 265 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);
// if (TELOPT_LINEMODE == a[i].ta_opt && WILL == a[i].ta_cmd)	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);
}
}	}
	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) {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.11
changed lines
	Added in v.1.1.1.1.2.14