Changeset 58292 in vbox for trunk/src/VBox

Timestamp:

Oct 17, 2015 10:04:46 PM (9 years ago)

Author:

vboxsync

Message:

localipc-posix.cpp: VERR_BROKEN_PIPE fixes for RTLocalIpcSessionRead.

File:

• trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/posix/localipc-posix.cpp

@@ -640 +640 @@
 
 
-#if 0 /* maybe later */
 /**
  * Checks if the socket has has a HUP condition.
@@ -649 +648 @@
 static bool rtLocalIpcPosixHasHup(PRTLOCALIPCSESSIONINT pThis)
 {
-# ifndef RT_OS_OS2
+#ifndef RT_OS_OS2
     struct pollfd PollFd;
     RT_ZERO(PollFd);
@@ -657 +656 @@
        && (PollFd.revents & POLLHUP);
 
-# else /* RT_OS_OS2: */
-    return false;
-# endif
-}
+#else /* RT_OS_OS2: */
+    return true;
 #endif
+}
 
 
@@ -693 +691 @@
 
                     rc = RTSocketRead(pThis->hSocket, pvBuffer, cbBuffer, pcbRead);
+
+                    /* Detect broken pipe. */
+                    if (rc == VINF_SUCCESS)
+                    {
+                        if (!pcbRead || *pcbRead)
+                        { /* likely */ }
+                        else if (rtLocalIpcPosixHasHup(pThis))
+                            rc = VERR_BROKEN_PIPE;
+                    }
+                    else if (rc == VERR_NET_CONNECTION_RESET_BY_PEER || rc == VERR_NET_SHUTDOWN)
+                        rc = VERR_BROKEN_PIPE;
 
                     int rc2 = RTCritSectEnter(&pThis->CritSect);