Changeset 26915 in vbox

Timestamp:

Mar 1, 2010 2:50:21 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/tcp: new function to query the local address of a socket.

Location:

trunk

Files:

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

trunk/include/iprt/tcp.h

@@ -250 +250 @@
 
 /**
+ * Gets the address of the local side.
+ *
+ * @returns IPRT status code.
+ * @param   Sock            Socket descriptor.
+ * @param   pAddr           Where to store the local address on success.
+ */
+RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr);
+
+/**
  * Gets the address of the other party.
  *

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

@@ -144 +144 @@
 } RTTCPSERVER;
 
+typedef union RTSOCKADDRUNION
+{
+    struct sockaddr     Addr;
+    struct sockaddr_in  Ipv4;
+#ifdef IPRT_WITH_TCPIP_V6
+    struct sockaddr_in6 Ipv6;
+#endif
+} RTSOCKADDRUNION;
 
 /*******************************************************************************
@@ -153 +161 @@
 static int  rtTcpServerDestroySocket(RTSOCKET volatile *pSockClient, const char *pszMsg);
 static int  rtTcpClose(RTSOCKET Sock, const char *pszMsg, bool fTryGracefulShutdown);
+static int  rtTcpConvertAddress(RTSOCKADDRUNION *pSrc, size_t cbSrc, PRTNETADDR pAddr);
 
 
@@ -1032 +1041 @@
 
 
-RTR3DECL(int) RTTcpGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr)
-{
-    union
-    {
-        struct sockaddr     Addr;
-        struct sockaddr_in  Ipv4;
+static int rtTcpConvertAddress(RTSOCKADDRUNION *pSrc, size_t cbSrc, PRTNETADDR pAddr)
+{
+    /*
+     * Convert the address.
+     */
+    if (   cbSrc == sizeof(struct sockaddr_in)
+        && pSrc->Addr.sa_family == AF_INET)
+    {
+        RT_ZERO(*pAddr);
+        pAddr->enmType      = RTNETADDRTYPE_IPV4;
+        pAddr->uPort        = RT_N2H_U16(pSrc->Ipv4.sin_port);
+        pAddr->uAddr.IPv4.u = pSrc->Ipv4.sin_addr.s_addr;
+    }
 #ifdef IPRT_WITH_TCPIP_V6
-        struct sockaddr_in6 Ipv6;
-#endif
-    }               u;
+    else if (   cbSrc == sizeof(struct sockaddr_in6)
+             && pSrc->Addr.sa_family == AF_INET6)
+    {
+        RT_ZERO(*pAddr);
+        pAddr->enmType            = RTNETADDRTYPE_IPV6;
+        pAddr->uPort              = RT_N2H_U16(pSrc->Ipv6.sin6_port);
+        pAddr->uAddr.IPv6.au32[0] = pSrc->Ipv6.sin6_addr.s6_addr32[0];
+        pAddr->uAddr.IPv6.au32[1] = pSrc->Ipv6.sin6_addr.s6_addr32[1];
+        pAddr->uAddr.IPv6.au32[2] = pSrc->Ipv6.sin6_addr.s6_addr32[2];
+        pAddr->uAddr.IPv6.au32[3] = pSrc->Ipv6.sin6_addr.s6_addr32[3];
+    }
+#endif
+    else
+        return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
+    return VINF_SUCCESS;
+}
+
+
+RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+    RTSOCKADDRUNION u;
 #ifdef RT_OS_WINDOWS
     int             cbAddr = sizeof(u);
@@ -1048 +1082 @@
 #endif
     RT_ZERO(u);
+    if (!getsockname(Sock, &u.Addr, &cbAddr))
+        return rtTcpConvertAddress(&u, cbAddr, pAddr);
+    return rtTcpError();
+}
+
+
+RTR3DECL(int) RTTcpGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+    RTSOCKADDRUNION u;
+#ifdef RT_OS_WINDOWS
+    int             cbAddr = sizeof(u);
+#else
+    socklen_t       cbAddr = sizeof(u);
+#endif
+    RT_ZERO(u);
     if (!getpeername(Sock, &u.Addr, &cbAddr))
-    {
-        /*
-         * Convert the address.
-         */
-        if (   cbAddr == sizeof(struct sockaddr_in)
-            && u.Addr.sa_family == AF_INET)
-        {
-            RT_ZERO(*pAddr);
-            pAddr->enmType      = RTNETADDRTYPE_IPV4;
-            pAddr->uPort        = RT_N2H_U16(u.Ipv4.sin_port);
-            pAddr->uAddr.IPv4.u = u.Ipv4.sin_addr.s_addr;
-        }
-#ifdef IPRT_WITH_TCPIP_V6
-        else if (   cbAddr == sizeof(struct sockaddr_in6)
-                 && u.Addr.sa_family == AF_INET6)
-        {
-            RT_ZERO(*pAddr);
-            pAddr->enmType            = RTNETADDRTYPE_IPV6;
-            pAddr->uPort              = RT_N2H_U16(u.Ipv6.sin6_port);
-            pAddr->uAddr.IPv6.au32[0] = u.Ipv6.sin6_addr.s6_addr32[0];
-            pAddr->uAddr.IPv6.au32[1] = u.Ipv6.sin6_addr.s6_addr32[1];
-            pAddr->uAddr.IPv6.au32[2] = u.Ipv6.sin6_addr.s6_addr32[2];
-            pAddr->uAddr.IPv6.au32[3] = u.Ipv6.sin6_addr.s6_addr32[3];
-        }
-#endif
-        else
-            return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
-        return VINF_SUCCESS;
-    }
+        return rtTcpConvertAddress(&u, cbAddr, pAddr);
     return rtTcpError();
 }