Changeset 53487 in vbox

Timestamp:

Dec 9, 2014 12:34:02 PM (10 years ago)

Author:

vboxsync

Message:

Split rtSocketBindRawAddr from rtSocketBind.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/socket.h (modified) (1 diff)
• r3/socket.cpp (modified) (1 diff)

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

@@ -56 +56 @@
 int rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol);
 int rtSocketBind(RTSOCKET hSocket, PCRTNETADDR pAddr);
+int rtSocketBindRawAddr(RTSOCKET hSocket, void const *pvAddr, size_t cbAddr);
 int rtSocketListen(RTSOCKET hSocket, int cMaxPending);
 int rtSocketAccept(RTSOCKET hSocket, PRTSOCKET phClient, struct sockaddr *pAddr, size_t *pcbAddr);

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

@@ -1589 +1589 @@
 int rtSocketBind(RTSOCKET hSocket, PCRTNETADDR pAddr)
 {
-    /*
-     * Validate input.
-     */
-    RTSOCKETINT *pThis = hSocket;
-    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
-    AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
-    AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
-
     RTSOCKADDRUNION u;
     int             cbAddr;
     int rc = rtSocketAddrFromNetAddr(pAddr, &u, sizeof(u), &cbAddr);
     if (RT_SUCCESS(rc))
-    {
-        if (bind(pThis->hNative, &u.Addr, cbAddr) != 0)
-            rc = rtSocketError();
-    }
+        rc = rtSocketBindRawAddr(hSocket, &u.Addr, cbAddr);
+    return rc;
+}
+
+
+/**
+ * Very thin wrapper around bind.
+ *
+ * @returns IPRT status code.
+ * @param   hSocket             The socket handle.
+ * @param   pvAddr              The address to bind to (struct sockaddr and
+ *                              friends).
+ * @param   cbAddr              The size of the address.
+ */
+int rtSocketBindRawAddr(RTSOCKET hSocket, void const *pvAddr, size_t cbAddr)
+{
+    /*
+     * Validate input.
+     */
+    RTSOCKETINT *pThis = hSocket;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+    AssertPtrReturn(pvAddr, VERR_INVALID_POINTER);
+    AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
+
+    int rc;
+    if (bind(pThis->hNative, (struct sockaddr const *)pvAddr, cbAddr) == 0)
+        rc = VINF_SUCCESS;
+    else
+        rc = rtSocketError();
 
     rtSocketUnlock(pThis);
     return rc;
 }
+