From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 9 Nov 1999 11:34:14 +0000 (+0000)
Subject: Fix unexpected network error 5000
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/8ce72d2c1c7651def2425be607ef623e6b0b9bd2

Fix unexpected network error 5000


git-svn-id: svn://svn.tartarus.org/sgt/putty@286 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/raw.c b/raw.c
index ff37b6d0..05e453aa 100644
--- a/raw.c
+++ b/raw.c
@@ -150,14 +150,22 @@ static int raw_msg (WPARAM wParam, LPARAM lParam) {
     int ret;
     char buf[256];
 
-    if (s == INVALID_SOCKET)	       /* how the hell did we get here?! */
-	return -5000;
+    /*
+     * Because reading less than the whole of the available pending
+     * data can generate an FD_READ event, we need to allow for the
+     * possibility that FD_READ may arrive with FD_CLOSE already in
+     * the queue; so it's possible that we can get here even with s
+     * invalid. If so, we return 1 and don't worry about it.
+     */
+    if (s == INVALID_SOCKET)
+	return 1;
 
     if (WSAGETSELECTERROR(lParam) != 0)
 	return -WSAGETSELECTERROR(lParam);
 
     switch (WSAGETSELECTEVENT(lParam)) {
       case FD_READ:
+      case FD_CLOSE:
 	ret = recv(s, buf, sizeof(buf), 0);
 	if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
 	    return 1;
@@ -165,7 +173,7 @@ static int raw_msg (WPARAM wParam, LPARAM lParam) {
 	    return -10000-WSAGetLastError();
 	if (ret == 0) {
 	    s = INVALID_SOCKET;
-	    return 0;		       /* can't happen, in theory */
+	    return 0;
 	}
 	c_write( buf, ret );
 	return 1;
@@ -184,9 +192,6 @@ static int raw_msg (WPARAM wParam, LPARAM lParam) {
 	if (outbuf_head != outbuf_reap)
 	    try_write();
 	return 1;
-      case FD_CLOSE:
-	s = INVALID_SOCKET;
-	return 0;
     }
     return 1;			       /* shouldn't happen, but WTF */
 }
diff --git a/ssh.c b/ssh.c
index 93a12807..d3df6bcb 100644
--- a/ssh.c
+++ b/ssh.c
@@ -772,14 +772,22 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) {
     int ret;
     char buf[256];
 
-    if (s == INVALID_SOCKET)	       /* how the hell did we get here?! */
-	return -5000;
+    /*
+     * Because reading less than the whole of the available pending
+     * data can generate an FD_READ event, we need to allow for the
+     * possibility that FD_READ may arrive with FD_CLOSE already in
+     * the queue; so it's possible that we can get here even with s
+     * invalid. If so, we return 1 and don't worry about it.
+     */
+    if (s == INVALID_SOCKET)
+	return 1;
 
     if (WSAGETSELECTERROR(lParam) != 0)
 	return -WSAGETSELECTERROR(lParam);
 
     switch (WSAGETSELECTEVENT(lParam)) {
       case FD_READ:
+      case FD_CLOSE:
 	ret = recv(s, buf, sizeof(buf), 0);
 	if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
 	    return 1;
@@ -787,14 +795,10 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) {
 	    return -10000-WSAGetLastError();
 	if (ret == 0) {
 	    s = INVALID_SOCKET;
-	    return 0;		       /* can't happen, in theory */
+	    return 0;
 	}
 	ssh_gotdata (buf, ret);
 	return 1;
-      case FD_CLOSE:
-	s = INVALID_SOCKET;
-        ssh_state = SSH_STATE_CLOSED;
-	return 0;
     }
     return 1;			       /* shouldn't happen, but WTF */
 }
diff --git a/telnet.c b/telnet.c
index 33b921b0..399c1260 100644
--- a/telnet.c
+++ b/telnet.c
@@ -586,14 +586,22 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) {
     int ret;
     char buf[256];
 
-    if (s == INVALID_SOCKET)	       /* how the hell did we get here?! */
-	return -5000;
+    /*
+     * Because reading less than the whole of the available pending
+     * data can generate an FD_READ event, we need to allow for the
+     * possibility that FD_READ may arrive with FD_CLOSE already in
+     * the queue; so it's possible that we can get here even with s
+     * invalid. If so, we return 1 and don't worry about it.
+     */
+    if (s == INVALID_SOCKET)
+	return 1;
 
     if (WSAGETSELECTERROR(lParam) != 0)
 	return -WSAGETSELECTERROR(lParam);
 
     switch (WSAGETSELECTEVENT(lParam)) {
       case FD_READ:
+      case FD_CLOSE:
 	ret = recv(s, buf, sizeof(buf), 0);
 	if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
 	    return 1;
@@ -601,7 +609,7 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) {
 	    return -10000-WSAGetLastError();
 	if (ret == 0) {
 	    s = INVALID_SOCKET;
-	    return 0;		       /* can't happen, in theory */
+	    return 0;
 	}
 #if 0
 	if (in_synch) {
@@ -632,9 +640,6 @@ static int telnet_msg (WPARAM wParam, LPARAM lParam) {
 	if (outbuf_head != outbuf_reap)
 	    try_write();
 	return 1;
-      case FD_CLOSE:
-	s = INVALID_SOCKET;
-	return 0;
     }
     return 1;			       /* shouldn't happen, but WTF */
 }