Changeset 27288 in vbox

Timestamp:

Mar 11, 2010 4:37:17 PM (15 years ago)

Author:

vboxsync

Message:

r3/tcp.cpp: Mark all sockets as no-inherit. (TODO: windows)

File:

• trunk/src/VBox/Runtime/r3/tcp.cpp (modified) (15 diffs)

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

@@ -48 +48 @@
 # include <netdb.h>
 # include <unistd.h>
+# include <fcntl.h>
 #endif /* !RT_OS_WINDOWS */
 #include <limits.h>
@@ -158 +159 @@
 static DECLCALLBACK(int)  rtTcpServerThread(RTTHREAD ThreadSelf, void *pvServer);
 static int  rtTcpServerListen(PRTTCPSERVER pServer);
-static int  rcTcpServerListenCleanup(PRTTCPSERVER pServer);
+static int  rtTcpServerListenCleanup(PRTTCPSERVER pServer);
 static int  rtTcpServerDestroySocket(RTSOCKET volatile *pSockClient, const char *pszMsg);
 static int  rtTcpClose(RTSOCKET Sock, const char *pszMsg, bool fTryGracefulShutdown);
@@ -217 +218 @@
             return VERR_UNRESOLVED_ERROR;
     }
+#endif
+}
+
+
+/**
+ * Helper that ensures the correct inheritability of a socket.
+ *
+ * We're currently ignoring failures.
+ *
+ * @param   Socket          The socket handle.
+ * @param   fInheritable    The desired inheritability state.
+ */
+static void rtTcpSetInheritance(RTSOCKET Socket, bool fInheritable)
+{
+#ifdef RT_OS_WINDOWS
+    /** @todo Find some magic way to change this...  Worst case we have to use
+     *        DuplicateHandle w/bInheritable=FALSE and replace the original
+     *        handles... */
+#else
+    fcntl(Socket, F_SETFD, fInheritable ? 0 : FD_CLOEXEC);
 #endif
 }
@@ -357 +378 @@
         rc = rtTcpServerListen(pServer);
     else
-        rc = rcTcpServerListenCleanup(pServer);
+        rc = rtTcpServerListenCleanup(pServer);
     RTMemPoolRelease(RTMEMPOOL_DEFAULT, pServer);
     NOREF(ThreadSelf);
@@ -425 +446 @@
     if (WaitSock != -1)
     {
+        rtTcpSetInheritance(WaitSock, false /*fInheritable*/);
+
         /*
          * Set socket options.
@@ -573 +596 @@
         if (    enmState != RTTCPSERVERSTATE_ACCEPTING
             &&  enmState != RTTCPSERVERSTATE_SERVING)
-            return rcTcpServerListenCleanup(pServer);
+            return rtTcpServerListenCleanup(pServer);
         if (!rtTcpServerTrySetState(pServer, RTTCPSERVERSTATE_ACCEPTING, enmState))
             continue;
@@ -589 +612 @@
             /* These are typical for what can happen during destruction. */
             if (errno == EBADF || errno == EINVAL || errno == ENOTSOCK)
-                return rcTcpServerListenCleanup(pServer);
+                return rtTcpServerListenCleanup(pServer);
 #endif
             continue;
         }
+        rtTcpSetInheritance(Socket, false /*fInheritable*/);
 
         /*
@@ -600 +624 @@
         {
             rtTcpClose(Socket, "rtTcpServerListen", true /*fTryGracefulShutdown*/);
-            return rcTcpServerListenCleanup(pServer);
+            return rtTcpServerListenCleanup(pServer);
         }
         rtTcpAtomicXchgSock(&pServer->SockClient, Socket);
@@ -622 +646 @@
             }
             else
-                rcTcpServerListenCleanup(pServer); /* ignore rc */
+                rtTcpServerListenCleanup(pServer); /* ignore rc */
             return rc;
         }
@@ -632 +656 @@
  * Clean up after listener.
  */
-static int rcTcpServerListenCleanup(PRTTCPSERVER pServer)
+static int rtTcpServerListenCleanup(PRTTCPSERVER pServer)
 {
     /*
@@ -706 +730 @@
             &&  enmState != RTTCPSERVERSTATE_CREATED)
         {
-            rc = rcTcpServerListenCleanup(pServer);
+            rc = rtTcpServerListenCleanup(pServer);
             break;
         }
@@ -729 +753 @@
             rc = rtTcpError();
             if (!rtTcpServerTrySetState(pServer, RTTCPSERVERSTATE_CREATED, RTTCPSERVERSTATE_ACCEPTING))
-                rc = rcTcpServerListenCleanup(pServer);
+                rc = rtTcpServerListenCleanup(pServer);
             if (RT_FAILURE(rc))
                 break;
             continue;
         }
+        rtTcpSetInheritance(Socket, false /*fInheritable*/);
 
         /*
@@ -740 +765 @@
         if (rtTcpServerTrySetState(pServer, RTTCPSERVERSTATE_SERVING, RTTCPSERVERSTATE_ACCEPTING))
         {
+            RTSOCKET OldSocket = rtTcpAtomicXchgSock(&pServer->SockClient, Socket);
+            Assert(OldSocket == NIL_RTSOCKET); NOREF(OldSocket);
             *pSockClient = Socket;
             rc = VINF_SUCCESS;
@@ -746 +773 @@
         {
             rtTcpClose(Socket, "RTTcpServerListen2", true /*fTryGracefulShutdown*/);
-            rc = rcTcpServerListenCleanup(pServer);
+            rc = rtTcpServerListenCleanup(pServer);
         }
         break;
@@ -1151 +1178 @@
     if (Sock != -1)
     {
+        rtTcpSetInheritance(Sock, false /*fInheritable*/);
+
         struct sockaddr_in InAddr;
         RT_ZERO(InAddr);