--- libaitcli/src/aitcli.c	2010/04/24 10:05:26	1.1.1.1.2.8
+++ libaitcli/src/aitcli.c	2010/05/03 08:28:35	1.1.1.1.2.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $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.14 2010/05/03 08:28:35 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -27,34 +27,15 @@ char cli_Error[STRSIZ];
 #pragma GCC visibility pop
 
 
+#ifdef NULL_PREP_TERM
+
 static void cli_Null_Prep_Term(int meta)
 {
 }
 
-static void cli_Null_Deprep_Term()
-{
-}
+#endif
 
-static int cli_Pre_Input_Change_Mode()
-{
-	return 0;
-}
 
-static int cli_GetC(FILE *dummy)
-{
-	int ch = rl_getc(stdin);
-
-	/*
-	if (is_special_char(ch)) {
-		pending_special_char = ch;
-		return '\r';
-	}
-	*/
-
-	return ch;
-}
-
-
 // cli_GetErrno() Get error code of last operation
 inline int cli_GetErrno()
 {
@@ -172,18 +153,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 +162,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;
+		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_oflag &= ~OPOST;
+	t.c_cflag &= ~PARENB;
+	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;
-
+#ifdef NULL_PREP_TERM
+	rl_instream = fdopen(pty, "r");
+#endif
 }
 
 /*
@@ -228,11 +203,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, r, s, 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,32 +216,46 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 		case 0:
 			close(sock);
 
+#ifdef NULL_PREP_TERM
+			rl_prep_term_function = cli_Null_Prep_Term;
+#endif
+
+			cliNetInit(getprogname(), STDIN_FILENO, term);
 			cliTTY(NULL, NULL, NULL, win);
-			ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0;
+//			ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0;
+			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) {
+			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 ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) {
+					if (a)
+						free(a);
+
 					if (-2 == ret)
 						continue;
 					// EOF
@@ -278,11 +267,33 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 					}
 					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 (s == pty && ret > 2 && 0x1b == buf[0] && 0x5b == buf[1]) {
+					memmove(buf, buf + 3, ret);
+					ret -= 3;
+				}*/
+				if ((ret = telnetSend(s, Attr, attrlen, buf, ret, 0)) == -1) {
 					cli_Errno = telnet_GetErrno();
 					strlcpy(cli_Error, telnet_GetError(), STRSIZ);
 					break;
-				}
+				} else
+					flg++;
 
 				/*
 				if ((ret = read(r, &ch, 1)) < 1) {