Changeset 51974 in vbox for trunk/src

Timestamp:

Jul 10, 2014 2:45:05 PM (11 years ago)

Author:

vboxsync

Message:

NAT/Net: Careful with that DWORD... It's unsigned, so assigning
negative values to it is a bad idea, especially when a coercion to a
wider signed type is about to happen. While here, don't test that
DWORD values are <= 0, just test for zero instead.

In particulat this fixes returning socket errors from
pxtcp_sock_recv() and pxtcp_sock_send() wrappers on Windows.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• proxy.c (modified) (3 diffs)
• pxping_win.c (modified) (2 diffs)
• pxtcp.c (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -201 +201 @@
                                 (LPSTR)&msg, 0,
                                 NULL);
-        if (nchars <= 0 || msg == NULL) {
+        if (nchars == 0 || msg == NULL) {
             cb += RTStrFormat(pfnOutput, pvArgOutput, NULL, NULL,
                               "Unknown error: %d", error);
@@ -528 +528 @@
 #else
     DWORD nsent;
+#endif
     int rc;
-#endif
     IOVEC fixiov[8];     /* fixed size (typical case) */
     const size_t fixiovsize = sizeof(fixiov)/sizeof(fixiov[0]);
@@ -573 +573 @@
 
     nsent = sendmsg(sock, &mh, 0);
+    rc = (nsent >= 0) ? 0 : SOCKET_ERROR;
 #else
     rc = WSASendTo(sock, iov, (DWORD)clen, &nsent, 0,
                    name, (int)namelen, NULL, NULL);
+#endif
     if (rc == SOCKET_ERROR) {
-        nsent = -1;
-    }
-#endif
-    if (nsent < 0) {
         error = SOCKERRNO();
         DPRINTF(("%s: socket %d: sendmsg: %R[sockerr]\n",

trunk/src/VBox/NetworkServices/NAT/pxping_win.c

@@ -303 +303 @@
 
     nreplies = IcmpParseReplies(pong->buf, (DWORD)pong->bufsize);
-    if (nreplies <= 0) {
+    if (nreplies == 0) {
         DWORD error = GetLastError();
         if (error == IP_REQ_TIMED_OUT) {
@@ -582 +582 @@
 
     nreplies = Icmp6ParseReplies(pong->buf, (DWORD)pong->bufsize);
-    if (nreplies <= 0) {
+    if (nreplies == 0) {
         DWORD error = GetLastError();
         if (error == IP_REQ_TIMED_OUT) {

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -1583 +1583 @@
                      0, NULL, NULL);
     if (status == SOCKET_ERROR) {
-        nsent = -SOCKERRNO();
+        return -SOCKERRNO();
     }
 
@@ -1867 +1867 @@
                      &flags, NULL, NULL);
     if (status == SOCKET_ERROR) {
-        nread = -SOCKERRNO();
+        return -SOCKERRNO();
     }