Changeset 9843 for trunk/src/ws2_32/socket.cpp

Timestamp:

Feb 24, 2003, 12:14:30 PM (23 years ago)

Author:

sandervl

Message:

WSASend/Recv fixes

File:

• trunk/src/ws2_32/socket.cpp (modified) (5 diffs)

trunk/src/ws2_32/socket.cpp

@@ -1 @@
-/* $Id: socket.cpp,v 1.15 2003-02-24 10:03:58 sandervl Exp $ */
+/* $Id: socket.cpp,v 1.16 2003-02-24 11:14:30 sandervl Exp $ */
 /*
  * based on Windows Sockets 1.1 specs
@@ -205 +205 @@
             tmpret = send(s, lpBuffers[i].buf, lpBuffers[i].len,  dwFlags);
             if(tmpret != SOCKET_ERROR) {
-                *lpNumberOfBytesSent += ret;
+                *lpNumberOfBytesSent += tmpret;
             }
             else {
@@ -211 +211 @@
                 break;
             }
+        }
+        if(*lpNumberOfBytesSent) {
+            WSASetLastError(NO_ERROR);
+            ret = NO_ERROR;
         }
         return ret;
@@ -259 +263 @@
             tmpret = recv(s, lpBuffers[i].buf, lpBuffers[i].len,  *lpFlags);
             if(tmpret != SOCKET_ERROR) {
-                *lpNumberOfBytesReceived += ret;
+                *lpNumberOfBytesReceived += tmpret;
             }
             else {
@@ -266 +270 @@
             }
         }
+        if(*lpNumberOfBytesReceived) {
+            WSASetLastError(NO_ERROR);
+            ret = NO_ERROR;
+        }
+        dprintf(("WSARecv returned %d (read %x)", ret, *lpNumberOfBytesReceived));
         *lpFlags = 0; //what to do with this?
         return ret;