Changeset 45948 in vbox for trunk

Timestamp:

May 8, 2013 12:32:54 PM (12 years ago)

Author:

vboxsync

Message:

IPRT: Added RTTcpClientConnectEx and RTTcpClientCancelConnect.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/tcp.h (modified) (1 diff)
• src/VBox/Runtime/r3/tcp.cpp (modified) (4 diffs)

trunk/include/iprt/mangling.h

@@ -1445 +1445 @@
 # define RTTarOpen                                      RT_MANGLER(RTTarOpen)
 # define RTTarSeekNextFile                              RT_MANGLER(RTTarSeekNextFile)
+# define RTTcpClientCancelConnect                       RT_MANGLER(RTTcpClientCancelConnect)
 # define RTTcpClientClose                               RT_MANGLER(RTTcpClientClose)
 # define RTTcpClientCloseEx                             RT_MANGLER(RTTcpClientCloseEx)
 # define RTTcpClientConnect                             RT_MANGLER(RTTcpClientConnect)
+# define RTTcpClientConnectEx                           RT_MANGLER(RTTcpClientConnectEx)
 # define RTTcpFlush                                     RT_MANGLER(RTTcpFlush)
 # define RTTcpGetLocalAddress                           RT_MANGLER(RTTcpGetLocalAddress)

trunk/include/iprt/tcp.h

@@ -171 +171 @@
 RTR3DECL(int) RTTcpClientConnect(const char *pszAddress, uint32_t uPort, PRTSOCKET pSock);
 
+/** Opaque pointer used by RTTcpClientConnectEx and RTTcpClientCancelConnect. */
+typedef struct RTTCPCLIENTCONNECTCANCEL *PRTTCPCLIENTCONNECTCANCEL;
+
+/**
+ * Connect (as a client) to a TCP Server, extended version.
+ *
+ * @returns iprt status code.
+ * @param   pszAddress      The address to connect to.
+ * @param   uPort           The port to connect to.
+ * @param   pSock           Where to store the handle to the established connection.
+ * @param   ppCancelCookie  Where to store information for canceling the
+ *                          operation (from a different thread). Optional.
+ *
+ *                          The pointer _must_ be initialized to NULL before a
+ *                          series of connection attempts begins, i.e. at a time
+ *                          where there will be no RTTcpClientCancelConnect
+ *                          calls racing access.  RTTcpClientCancelConnect will
+ *                          set it to a special non-NULL value that causes the
+ *                          current or/and next connect call to fail.
+ *
+ * @sa      RTTcpClientCancelConnect
+ */
+RTR3DECL(int) RTTcpClientConnectEx(const char *pszAddress, uint32_t uPort, PRTSOCKET pSock,
+                                   PRTTCPCLIENTCONNECTCANCEL volatile *ppCancelCookie);
+
+/**
+ * Cancels a RTTcpClientConnectEx call on a different thread.
+ *
+ * @returns iprt status code.
+ * @param   ppCancelCookie  The address of the cookie pointer shared with the
+ *                          connect call.
+ */
+RTR3DECL(int) RTTcpClientCancelConnect(PRTTCPCLIENTCONNECTCANCEL volatile *ppCancelCookie);
+
 /**
  * Close a socket returned by RTTcpClientConnect().

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

@@ -806 +806 @@
 RTR3DECL(int) RTTcpClientConnect(const char *pszAddress, uint32_t uPort, PRTSOCKET pSock)
 {
+    return RTTcpClientConnectEx(pszAddress, uPort, pSock, NULL);
+}
+
+
+RTR3DECL(int) RTTcpClientConnectEx(const char *pszAddress, uint32_t uPort, PRTSOCKET pSock,
+                                   PRTTCPCLIENTCONNECTCANCEL volatile *ppCancelCookie)
+{
     /*
      * Validate input.
@@ -811 +818 @@
     AssertReturn(uPort > 0, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszAddress, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(ppCancelCookie, VERR_INVALID_POINTER);
 
     /*
@@ -829 +837 @@
         RTSocketSetInheritance(Sock, false /*fInheritable*/);
 
-        rc = rtSocketConnect(Sock, &Addr);
+        if (!ppCancelCookie)
+            rc = rtSocketConnect(Sock, &Addr);
+        else
+        {
+            RTSocketRetain(Sock);
+            if (ASMAtomicCmpXchgPtr(ppCancelCookie, (PRTTCPCLIENTCONNECTCANCEL)Sock, NULL))
+            {
+                rc = rtSocketConnect(Sock, &Addr);
+                if (ASMAtomicCmpXchgPtr(ppCancelCookie, NULL, (PRTTCPCLIENTCONNECTCANCEL)Sock))
+                    RTSocketRelease(Sock);
+                else
+                    rc = VERR_CANCELLED;
+            }
+            else
+            {
+                RTSocketRelease(Sock);
+                rc = VERR_CANCELLED;
+            }
+        }
         if (RT_SUCCESS(rc))
         {
@@ -838 +864 @@
         rtTcpClose(Sock, "RTTcpClientConnect", false /*fTryGracefulShutdown*/);
     }
+    if (ppCancelCookie)
+        *ppCancelCookie = NULL;
     return rc;
+}
+
+
+RTR3DECL(int) RTTcpClientCancelConnect(PRTTCPCLIENTCONNECTCANCEL volatile *ppCancelCookie)
+{
+    AssertPtrReturn(ppCancelCookie, VERR_INVALID_POINTER);
+
+    AssertCompile(NIL_RTSOCKET == NULL);
+    RTSOCKET hSock = (RTSOCKET)ASMAtomicXchgPtr((void * volatile *)ppCancelCookie, (void *)(uintptr_t)0xdead9999);
+    if (hSock != NIL_RTSOCKET)
+    {
+        int rc = rtTcpClose(hSock, "RTTcpClientCancelConnect", false /*fTryGracefulShutdown*/);
+        AssertRCReturn(rc, rc);
+    }
+
+    return VINF_SUCCESS;
 }