Changeset 7805 for trunk/src

Timestamp:

Feb 6, 2002, 11:33:56 AM (24 years ago)

Author:

sandervl

Message:

minor recv update (error handling)

File:

• trunk/src/wsock32/wsock32.cpp (modified) (4 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.45 2001-11-27 11:13:03 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.46 2002-02-06 10:33:56 sandervl Exp $ */
 
 /*
@@ -657 +657 @@
    if(ret == SOCKET_ERROR) {
         WSASetLastError(wsaErrno());
+        return SOCKET_ERROR;
    }
    else 
@@ -663 +664 @@
 
         state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
+        if(state & SS_CANTRCVMORE) {
+                dprintf(("recv returned 0, socket is no longer connected -> return WSAENOTCONN"));
+                WSASetLastError(WSANO_DATA);
+                return 0; //graceful close
+        }
+        else
+        if(state & (SS_ISDISCONNECTING|SS_ISDISCONNECTED)) {
+                dprintf(("recv returned 0, socket is no longer connected -> return WSAENOTCONN"));
+                WSASetLastError(WSAENOTCONN);
+                return 0; //graceful close
+        }
+        else
         if(state & SS_ISCONNECTED && flags != MSG_PEEK) {
                 dprintf(("recv returned 0, but socket is still connected -> return WSAWOULDBLOCK"));
                 WSASetLastError(WSAEWOULDBLOCK);
-                ret = 0; //graceful close
+                return SOCKET_ERROR;
         }
    }
@@ -974 +987 @@
                 }
                 yy = (struct ws_linger *)optval;
+                dprintf(("%s: onoff %x linger %x", (optname == SO_DONTLINGER) ? "SO_DONTLINGER" : "SO_LINGER", (int)yy->l_onoff, (int)yy->l_linger));
                 xx.l_onoff  = (optname == SO_DONTLINGER) ? !yy->l_onoff : yy->l_onoff;
                 xx.l_linger = yy->l_linger;