Improved SSH client interactive mode and fixed control-c to work

Console API is now used for interactive tty mode. Thus ssh.exe client
can now pass each character to remote side as one types so that programs
like more works correctly. Control-c now will stop the remote program
instead of exiting the ssh.exe.

Author: quamrulmina

channels.c

@@ -1685,6 +1685,10 @@ channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
 	if (c->rfd != -1 && (force || FD_ISSET(c->rfd, readset))) {
 		errno = 0;
 		len = read(c->rfd, buf, sizeof(buf));
+		#ifdef WIN32_FIXME
+		if (len == 0)
+			return 1; // in Win32 console read, there may be no data, but is ok
+		#endif
 		if (len < 0 && (errno == EINTR ||
 		    ((errno == EAGAIN || errno == EWOULDBLOCK) && !force)))
 			return 1;
@@ -2395,9 +2399,7 @@ channel_output_poll(void)
 		}
 	}
 }
-#ifdef WIN32_FIXME
-int lftocrlf = 0;
-#endif
+
 /* -- protocol input */
 
 /* ARGSUSED */

clientloop.c

@@ -1348,14 +1348,14 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
 		 * and append it to the buffer.
 		 */
 		last_was_cr = (ch == '\r' || ch == '\n');
-		#ifdef WIN32_FIXME
-		extern int lftocrlf ; // defined in channels.c file's channel_input_data() function for now
-		if ( (lftocrlf == 1) && ( ch == '\n') ) {
+		//#ifdef WIN32_FIXME
+		//extern int lftocrlf ; // defined in channels.c file's channel_input_data() function for now
+		//if ( (lftocrlf == 1) && ( ch == '\n') ) {
 			// add a \r before \n if sshd server sent us ESC[20h during initial tty mode setting
-			buffer_put_char(bin, '\r');
-			bytes++;
-		}
-		#endif
+			//buffer_put_char(bin, '\r');
+			//bytes++;
+		//}
+		//#endif
 		buffer_put_char(bin, ch);
 		bytes++;
 	}

contrib/win32/win32compat/Makefile.in

@@ -19,7 +19,8 @@ LDFLAGS=-L. @LDFLAGS@ -L/lib/win32api
 
 WIN32COMPATFILES = daemon.o gettimeofday.o homedirhelp.o pwd.o sfds.o \
 	socket.o startupneeds.o strcasecmp.o syslog.o lsalogon.o lsastring.o \
-	stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o console.o tnnet.o conio.o
+	stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o \
+	console.o tnnet.o conio.o tncon.o
 
 WIN32COMPATLIB=@LIBWIN32COMPAT@
 

contrib/win32/win32compat/ansiprsr.c

@@ -51,7 +51,7 @@
 // items used from other modules
 int NetWriteString(char* pszString, size_t cbString);
 TelParams Parameters;
-extern int lftocrlf;
+int lftocrlf = 0;
 
 extern int ScreenX;
 extern  int ScreenY;

contrib/win32/win32compat/ansiprsr.h

@@ -55,11 +55,28 @@ unsigned char * ParseVT52(unsigned char * pszBuffer, unsigned char * pszBufferEn
 
 typedef struct _TelParams 
 {
+	int fLogging;
+	FILE *fplogfile;
+
+	char *pInputFile;
+
+	char * szDebugInputFile;
+    BOOL   fDebugWait;
+
 	int timeOut;
 	int fLocalEcho;
 	int fTreatLFasCRLF;
 	int	fSendCROnly;
 	int nReceiveCRLF;
+	//_crlftype nReceiveCRLF;
+	char	sleepChar;
+	char	menuChar;
+
+	SOCKET	Socket;
+	BOOL bVT100Mode;
+
+	char	*pAltKey;
+
 } TelParams;
 
 #endif

contrib/win32/win32compat/socket.c

@@ -54,6 +54,7 @@ extern void debug3(const char *fmt,...);
 extern void error(const char *fmt,...);
 extern void fatal(const char *fmt,...);
 
+int glob_itissshclient = 0; // ssh client turns it to 1
 static int winsock_initialized = 0;
 
 extern int logfd;
@@ -1545,7 +1546,26 @@ int socketpair(int socks[2])
   return SOCKET_ERROR;
 }
 
+int DataAvailable ( HANDLE h )
+{
+    INPUT_RECORD irec = {0};
+
+    DWORD events_read = 0;
+
+    int ret = PeekConsoleInput (h, &irec, 1, &events_read);
+
+    if (!ret)
+    {
+      return 0;
+    }
+
+    if (events_read) // && irec.EventType == KEY_EVENT)
+    {
+      return events_read ;
+    }
 
+	return 0;
+}
 int peekConsoleRead(int sfd)
 {
   DWORD sleep_time = 0;
@@ -2391,8 +2411,9 @@ int WSHELPread(int sfd, char *dst, unsigned int max)
   SOCKET sock;
 
   int ret = -1;
+  int sfd_type = get_sfd_type(sfd);
 
-  switch(get_sfd_type(sfd))
+  switch (sfd_type)
   {
     case SFD_TYPE_SOCKET:
     {
@@ -2450,8 +2471,9 @@ int WSHELPread(int sfd, char *dst, unsigned int max)
 
     case SFD_TYPE_FD:
     case SFD_TYPE_PIPE:
-    case SFD_TYPE_CONSOLE:
+    //case SFD_TYPE_CONSOLE:
     {
+
       ret = _read(sfd_to_fd(sfd), dst, max);
 
       if (FD_ISSET(sfd_to_fd(sfd), &debug_sfds))
@@ -2470,6 +2492,25 @@ int WSHELPread(int sfd, char *dst, unsigned int max)
                   sfd, GetLastError());
       }
 
+      break;
+    }
+	case SFD_TYPE_CONSOLE:
+    {
+		//if (sfd_type == SFD_TYPE_CONSOLE) {
+			// we could be send here due to ctrl-c input, so no data to read
+			//if ( DataAvailable (sfd_to_handle(sfd)) <=0  )
+				//return 1; // no data to read
+		//}
+      ret = ReadConsoleForTermEmul( sfd_to_handle(sfd), dst, max);
+
+      if (ret < 0)
+      {
+        error("read from pipe/console sfd [%d] failed with error code [%d]",
+                  sfd, GetLastError());
+      }
+      if (ret == 0)
+    	  return 0; //1;
+
       break;
     }
     case 99:
@@ -2519,7 +2560,11 @@ int WSHELPwrite(int sfd, const char *buf, unsigned int max)
 
   int ret = -1;
 
-  switch(get_sfd_type(sfd))
+  int sfd_type = get_sfd_type(sfd);
+  if ( (glob_itissshclient) && ( sfd_type == SFD_TYPE_CONSOLE ) )
+	  sfd_type = SFD_TYPE_PIPE ; // client write type uses _write() in place ofn console insertion
+
+  switch(sfd_type)
   {
     case SFD_TYPE_SOCKET:
     {