Changeset 49694 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Nov 28, 2013 4:47:11 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90964

Message:

Provide implementation of inet_ntop(), which is available only since
Vista, in terms of WSAAddressToStringA(), available ~everywhere. It
should probably be exiled into a proper .c file, but inline will do
for now.

File:

• trunk/src/VBox/NetworkServices/NAT/winutils.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/winutils.h

@@ -36 +36 @@
 #  define __func__ __FUNCTION__
 #  define __attribute__(x) /* IGNORE */
-#  define inet_ntop(dom, pvaddr, pstrbuf, cbstrbuf) InetNtop((dom),(pvaddr),(pstrbuf),(cbstrbuf))
+
+/*
+ * XXX: inet_ntop() is only available starting from Vista.
+ */
+DECLINLINE(PCSTR)
+inet_ntop(INT Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize)
+{
+    DWORD size = (DWORD)StringBufSize;
+    int status;
+
+    if (Family == AF_INET)
+    {
+        struct sockaddr_in sin;
+        memset(&sin, 0, sizeof(sin));
+        sin.sin_family = AF_INET;
+        memcpy(&sin.sin_addr, pAddr, sizeof(sin.sin_addr));
+        sin.sin_port = 0;
+        status = WSAAddressToStringA((LPSOCKADDR)&sin, sizeof(sin), NULL,
+                                     pStringBuf, &size);
+    }
+    else if (Family == AF_INET6)
+    {
+        struct sockaddr_in6 sin6;
+        memset(&sin6, 0, sizeof(sin6));
+        sin6.sin6_family = AF_INET6;
+        memcpy(&sin6.sin6_addr, pAddr, sizeof(sin6.sin6_addr));
+        sin6.sin6_port = 0;
+        status = WSAAddressToStringA((LPSOCKADDR)&sin6, sizeof(sin6), NULL,
+                                     pStringBuf, &size);
+    }
+    else
+    {
+        WSASetLastError(WSAEAFNOSUPPORT);
+        return NULL;
+    }
+
+    if (status == SOCKET_ERROR)
+    {
+        return NULL;
+    }
+
+    return pStringBuf;
+}