X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c9def1b8e8960113ab4fd91d0b69d5b422cf339f..97db3be4f673508e214040881556d35f3d65406a:/telnet.c

diff --git a/telnet.c b/telnet.c
index 1b83a311..4fb39c63 100644
--- a/telnet.c
+++ b/telnet.c
@@ -1,7 +1,13 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
 #include <winsock.h>
+#endif
+#endif
 
 #include "putty.h"
 
@@ -552,7 +558,7 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) {
 	  default: return "connect(): unknown error";
 	}
 
-    if (WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ |
+    if (hwnd && WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ |
 			FD_WRITE | FD_OOB | FD_CLOSE) == SOCKET_ERROR)
 	switch (WSAGetLastError()) {
 	  case WSAENETDOWN: return "Network is down";
@@ -583,6 +589,12 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) {
      * Set up SYNCH state.
      */
     in_synch = FALSE;
+
+    /*
+     * We have no pre-session phase.
+     */
+    begin_session();
+
     return NULL;
 }
 
@@ -608,8 +620,11 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) {
     if (s == INVALID_SOCKET)
 	return 1;
 
-    if (WSAGETSELECTERROR(lParam) != 0)
+    if (WSAGETSELECTERROR(lParam) != 0) {
+        closesocket(s);
+        s = INVALID_SOCKET;
 	return -WSAGETSELECTERROR(lParam);
+    }
 
     switch (WSAGETSELECTEVENT(lParam)) {
       case FD_READ:
@@ -625,13 +640,15 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) {
 		ret = recv(s, buf, sizeof(buf), 0);
 		if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
 		    return 1;
-		if (ret < 0)		       /* any _other_ error */
+		if (ret < 0) {		       /* any _other_ error */
+                    closesocket(s);
+                    s = INVALID_SOCKET;
 		    return -10000-WSAGetLastError();
+                }
 		if (ret == 0) {
 		    s = INVALID_SOCKET;
 		    return 0;
 		}
-
 	        do_telnet_read (buf, ret);
 	    } while (in_synch);
 	}
@@ -733,10 +750,17 @@ static void telnet_special (Telnet_Special code) {
     }
 }
 
+static SOCKET telnet_socket(void) { return s; }
+
+static int telnet_sendok(void) { return 1; }
+
 Backend telnet_backend = {
     telnet_init,
     telnet_msg,
     telnet_send,
     telnet_size,
-    telnet_special
+    telnet_special,
+    telnet_socket,
+    telnet_sendok,
+    23
 };