Changeset 47966 in vbox for trunk

Timestamp:

Aug 21, 2013 1:25:41 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88283

Message:

lwip-nat: zero counter of sent bytes before sending to WSASend(_,&nsent,), and assign it to -1 explicitly on error (SOCKET_ERROR).

File:

• trunk/src/VBox/Devices/Network/lwip-new/vbox/pxtcp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/vbox/pxtcp.c

@@ -1469 +1469 @@
         nsent = sendmsg(pxtcp->sock, &mh, send_flags);
 #else
-        nsent = -1; /* unix send*'s "assignment" semantic, that different from WSA */
+        /**
+         * WSASend(,,,DWORD *,,,) - takes SSIZE_T (64bit value) ... so all nsent's 
+         * bits should be zeroed before passing to WSASent.
+         */
+        nsent = 0; 
         rc = WSASend(pxtcp->sock, iov, (DWORD)i, (DWORD *)&nsent, 0, NULL, NULL);
         if (rc == SOCKET_ERROR) {
-            /* WSASent reports both status code and nsent
-             * need some eurisitic how to work with it.
+            /* WSASent reports SOCKET_ERROR and updates error accessible with 
+             * WSAGetLastError(). We assign nsent to -1, enforcing code below
+             * to access error in BSD style.
              */
             warn("pxtcp_pcb_forward_outbound:WSASend error:%d nsent:%d\n", 
                  WSAGetLastError(),
                  nsent);
-        }
+            nsent = -1; 
+       }
 #endif
+ 
         if (nsent == (ssize_t)fwd1) {
             /* successfully sent this chain fragment completely */