Changeset 63672 in vbox

Timestamp:

Aug 31, 2016 10:20:23 AM (9 years ago)

Author:

vboxsync

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

110418

Message:

NAT: soread - save errno from recv(2) that we check later on as it may
be clobbered by logging in the debug build.

File:

• trunk/src/VBox/Devices/Network/slirp/socket.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -244 +244 @@
     struct iovec iov[2];
     int mss = so->so_tcpcb->t_maxseg;
+    int sockerr;
 
     STAM_PROFILE_START(&pData->StatIOread, a);
@@ -321 +322 @@
     nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
 #endif
+    sockerr = errno;  /* save it, as it may be clobbered by logging */
     Log2(("%s: read(1) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
     Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
@@ -344 +346 @@
         }
         if (   nn < 0
-            && soIgnorableErrorCode(errno))
+            && soIgnorableErrorCode(sockerr))
         {
             SOCKET_UNLOCK(so);
@@ -358 +360 @@
             /* nn == 0 means peer has performed an orderly shutdown */
             Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
-                  RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
+                  RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sockerr, strerror(sockerr)));
             sofcantrcvmore(so);
             if (!fUninitializedTemplate)
                 tcp_sockclosed(pData, sototcpcb(so));
             else
-                tcp_drop(pData, sototcpcb(so), errno);
+                tcp_drop(pData, sototcpcb(so), sockerr);
             SOCKET_UNLOCK(so);
             STAM_PROFILE_STOP(&pData->StatIOread, a);