Changeset 64534 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Nov 3, 2016 3:30:38 PM (8 years ago)

Author:

vboxsync

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

111715

Message:

NAT: bugref:8634 - restrict the fix in r111333 (bugref:8573) to Linux
for now. Requires more testing on other hosts as poll events and
error reporting from socket syscalls seems to differ quite a bit in
these scenarios.

File:

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

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

@@ -377 +377 @@
             else
             {
-                LogRel2(("NAT: sockerr %d, shuterr %d - %R[natsock]\n", sockerr, shuterr, so));
+                LogRel(("NAT: sockerr %d, shuterr %d - %R[natsock]\n", sockerr, shuterr, so));
                 tcp_drop(pData, sototcpcb(so), sockerr);
             }
@@ -1118 +1118 @@
          * If remote closes first and then sends an RST, the recv() in
          * soread() will keep reporting EOF without any error
-         * indication, so we must also check if shutdown() succeeds
-         * here.
+         * indication.  As far as I can tell the only way to detect
+         * this on Linux is to check if shutdown() succeeds here (but
+         * see below).
+         * 
+         * OTOH on OS X shutdown() "helpfully" checks if remote has
+         * already closed and then always returns ENOTCONN
+         * immediately.
          */
-        int status = shutdown(so->s, 0);
+        int status = shutdown(so->s, SHUT_RD);
+#if defined(RT_OS_LINUX)
         if (status < 0)
             err = errno;
+#else
+        RT_NOREF(status);
+#endif
     }
     so->so_state &= ~(SS_ISFCONNECTING);
     if (so->so_state & SS_FCANTSENDMORE)
     {
+#if defined(RT_OS_LINUX)
         /*
          * If we have closed first, and remote closes, shutdown will
@@ -1135 +1145 @@
         if (err == ENOTCONN)
             err = 0;
+#endif
         so->so_state = SS_NOFDREF; /* Don't select it */
                                    /* XXX close() here as well? */