Changeset 86415 in vbox

Timestamp:

Oct 2, 2020 11:50:21 AM (4 years ago)

Author:

vboxsync

Message:

IPRT,++: Made RTHandleGetStandard's fLeaveOpen parameter work for sockets too. bugref:9841

Location:

trunk

Files:

• include/iprt/handle.h (modified) (1 diff)
• src/VBox/Runtime/include/internal/socket.h (modified) (1 diff)
• src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/socket.cpp (modified) (8 diffs)
• src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp (modified) (1 diff)

trunk/include/iprt/handle.h

@@ -57 +57 @@
  * @param   fLeaveOpen      Whether closing the returned handle should leave the
  *                          native standard handle open or not.
- *                          Note! This currently only works with pipe!
+ *                          Note! This currently only works with pipes and
+ *                                sockets!
  * @param   ph              Pointer to the generic handle.  This will contain
  *                          the most appropriate IPRT handle on success.

trunk/src/VBox/Runtime/include/internal/socket.h

@@ -56 +56 @@
 #ifndef IPRT_INTERNAL_SOCKET_POLLING_ONLY
 DECLHIDDEN(int) rtSocketResolverError(void);
-DECLHIDDEN(int) rtSocketCreateForNative(RTSOCKETINT **ppSocket, RTSOCKETNATIVE hNative);
+DECLHIDDEN(int) rtSocketCreateForNative(RTSOCKETINT **ppSocket, RTSOCKETNATIVE hNative, bool fLeaveOpen);
 DECLHIDDEN(int) rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol);
 DECLHIDDEN(int) rtSocketCreateTcpPair(RTSOCKET *phServer, RTSOCKET *phClient);

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

@@ -120 +120 @@
 
         case RTHANDLETYPE_SOCKET:
-            /** @todo fLeaveOpen   */
-            rc = rtSocketCreateForNative(&h.u.hSocket, fd);
+            rc = rtSocketCreateForNative(&h.u.hSocket, fd, fLeaveOpen);
             break;
 

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -149 +149 @@
      * currently. */
     bool                fBlocking;
+    /** Whether to leave the native socket open rather than closing it (for
+     * RTHandleGetStandard). */
+    bool                fLeaveOpen;
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
     /** The pollset currently polling this socket.  This is NIL if no one is
@@ -496 +499 @@
  * @param   ppSocket        Where to return the IPRT socket handle.
  * @param   hNative         The native handle.
- */
-DECLHIDDEN(int) rtSocketCreateForNative(RTSOCKETINT **ppSocket, RTSOCKETNATIVE hNative)
+ * @param   fLeaveOpen      Whether to leave the native socket handle open when
+ *                          closed.
+ */
+DECLHIDDEN(int) rtSocketCreateForNative(RTSOCKETINT **ppSocket, RTSOCKETNATIVE hNative, bool fLeaveOpen)
 {
     RTSOCKETINT *pThis = (RTSOCKETINT *)RTMemPoolAlloc(RTMEMPOOL_DEFAULT, sizeof(*pThis));
@@ -506 +511 @@
     pThis->hNative          = hNative;
     pThis->fClosed          = false;
+    pThis->fLeaveOpen       = fLeaveOpen;
     pThis->fBlocking        = true;
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
@@ -539 +545 @@
 #endif
     AssertPtrReturn(phSocket, VERR_INVALID_POINTER);
-    return rtSocketCreateForNative(phSocket, uNative);
+    return rtSocketCreateForNative(phSocket, uNative, false /*fLeaveOpen*/);
 }
 
@@ -579 +585 @@
      * Wrap it.
      */
-    int rc = rtSocketCreateForNative(phSocket, hNative);
+    int rc = rtSocketCreateForNative(phSocket, hNative, false /*fLeaveOpen*/);
     if (RT_FAILURE(rc))
     {
@@ -724 +730 @@
     if (RT_SUCCESS(rc))
     {
-        rc = rtSocketCreateForNative(phServer, hServer);
+        rc = rtSocketCreateForNative(phServer, hServer, false /*fLeaveOpen*/);
         if (RT_SUCCESS(rc))
         {
-            rc = rtSocketCreateForNative(phClient, hClient);
+            rc = rtSocketCreateForNative(phClient, hClient, false /*fLeaveOpen*/);
             if (RT_SUCCESS(rc))
                 return VINF_SUCCESS;
@@ -806 +812 @@
             pThis->hNative = NIL_RTSOCKETNATIVE;
 
-#ifdef RT_OS_WINDOWS
-            AssertReturn(g_pfnclosesocket, VERR_NET_NOT_UNSUPPORTED);
-            if (g_pfnclosesocket(hNative))
+            if (!pThis->fLeaveOpen)
+            {
+#ifdef RT_OS_WINDOWS
+                AssertReturn(g_pfnclosesocket, VERR_NET_NOT_UNSUPPORTED);
+                if (g_pfnclosesocket(hNative))
 #else
-            if (close(hNative))
-#endif
-            {
-                rc = rtSocketError();
-#ifdef RT_OS_WINDOWS
-                AssertMsgFailed(("closesocket(%p) -> %Rrc\n", (uintptr_t)hNative, rc));
+                if (close(hNative))
+#endif
+                {
+                    rc = rtSocketError();
+#ifdef RT_OS_WINDOWS
+                    AssertMsgFailed(("closesocket(%p) -> %Rrc\n", (uintptr_t)hNative, rc));
 #else
-                AssertMsgFailed(("close(%d) -> %Rrc\n", hNative, rc));
-#endif
+                    AssertMsgFailed(("close(%d) -> %Rrc\n", hNative, rc));
+#endif
+                }
             }
         }
@@ -2299 +2308 @@
          * Wrap the client socket.
          */
-        rc = rtSocketCreateForNative(phClient, hNativeClient);
+        rc = rtSocketCreateForNative(phClient, hNativeClient, false /*fLeaveOpen*/);
         if (RT_FAILURE(rc))
         {

trunk/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp

@@ -114 +114 @@
 
         case RTHANDLETYPE_SOCKET:
-            /** @todo fLeaveOpen */
-            rc = rtSocketCreateForNative(&h.u.hSocket, (RTHCUINTPTR)hNative);
+            rc = rtSocketCreateForNative(&h.u.hSocket, (RTHCUINTPTR)hNative, fLeaveOpen);
             break;