--- libaitcli/src/aitcli.c	2010/04/28 11:23:56	1.1.1.1.2.10
+++ libaitcli/src/aitcli.c	2010/05/03 08:10:05	1.1.1.1.2.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.1.1.1.2.10 2010/04/28 11:23:56 misho Exp $
+* $Id: aitcli.c,v 1.1.1.1.2.13 2010/05/03 08:10:05 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -27,11 +27,15 @@ char cli_Error[STRSIZ];
 #pragma GCC visibility pop
 
 
+#ifdef NULL_PREP_TERM
+
 static void cli_Null_Prep_Term(int meta)
 {
 }
 
+#endif
 
+
 // cli_GetErrno() Get error code of last operation
 inline int cli_GetErrno()
 {
@@ -149,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
@@ -192,8 +184,12 @@ void cliNetInit(const char *csProg, int pty, struct te
 
 	ioctl(pty, TIOCPKT, &on);
 
-	cliInit(csProg);
+	rl_readline_name = csProg;
+	rl_variable_bind("editing-mode", "emacs");
+
+#ifdef NULL_PREP_TERM
 	rl_instream = fdopen(pty, "r");
+#endif
 }
 
 /*
@@ -207,12 +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, attrlen;
+	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[5];
-	register int i;
+	struct telnetAttrs *a, Attr[10];
 
 	switch (forkpty(&pty, NULL, term, win)) {
 		case -1:
@@ -221,26 +216,27 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 		case 0:
 			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);
-//			cliInit(getprogname());
 			cliTTY(NULL, NULL, NULL, win);
 //			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, WILL, TELOPT_SGA);
-			telnet_SetCmd(Attr + 2, DO, TELOPT_LINEMODE);
-			telnet_Set_SubOpt(Attr + 3, TELOPT_LINEMODE, LM_MODE, "\x0", 1);
-			if ((ret = telnetSend(sock, Attr, 4, 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_RESTART_XON, NULL, 0);
+			telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
+			telnet_SetCmd(Attr + 4, DONT, 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);
@@ -271,28 +267,33 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 					}
 					break;
 				}
-				for (attrlen = i = 0; i < alen; i++) {
-					if (TELOPT_TTYPE == a[i].ta_opt && WILL == a[i].ta_cmd)
-						telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_TTYPE, TELQUAL_SEND, NULL, 0);
-					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);
-					}
+				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);
-#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 ===========", ret);
+
+				/*
+				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) {