Changeset 64298 in vbox for trunk/src

Timestamp:

Oct 17, 2016 1:55:11 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8573: applied FIN-RST-2.diff: fix for shutting down half-closed sockets

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• socket.c (modified) (3 diffs)
• socket.h (modified) (1 diff)

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

@@ -363 +363 @@
         {
             int fUninitializedTemplate = 0;
+            int shuterr;
+
             fUninitializedTemplate = RT_BOOL((   sototcpcb(so)
                                               && (  sototcpcb(so)->t_template.ti_src.s_addr == INADDR_ANY
@@ -369 +371 @@
             Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
                   RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sockerr, strerror(sockerr)));
-            sofcantrcvmore(so);
-            if (!fUninitializedTemplate)
+
+            shuterr = sofcantrcvmore(so);
+            if (!sockerr && !shuterr && !fUninitializedTemplate)
                 tcp_sockclosed(pData, sototcpcb(so));
             else
@@ -1101 +1104 @@
 }
 
-void
+int
 sofcantrcvmore(struct  socket *so)
 {
+    int err = 0;
+
     LogFlowFunc(("ENTER: so:%R[natsock]\n", so));
     if ((so->so_state & SS_NOFDREF) == 0)
     {
-        shutdown(so->s, 0);
+        /*
+         * 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.
+         */
+        int status = shutdown(so->s, 0);
+        if (status < 0)
+            err = errno;
     }
     so->so_state &= ~(SS_ISFCONNECTING);
     if (so->so_state & SS_FCANTSENDMORE)
+    {
+        /*
+         * If we have closed first, and remote closes, shutdown will
+         * return ENOTCONN, but this is expected.  Don't tell the
+         * caller there was an error.
+         */
+        if (err == ENOTCONN)
+            err = 0;
         so->so_state = SS_NOFDREF; /* Don't select it */
                                    /* XXX close() here as well? */
+    }
     else
         so->so_state |= SS_FCANTRCVMORE;
-    LogFlowFuncLeave();
+
+    LogFlowFunc(("LEAVE: %d\n", err));
+    return err;
 }
 

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

@@ -182 +182 @@
 void soisfconnecting (register struct socket *);
 void soisfconnected (register struct socket *);
-void sofcantrcvmore (struct  socket *);
+int sofcantrcvmore (struct  socket *);
 void sofcantsendmore (struct socket *);
 void soisfdisconnected (struct socket *);