Changeset 51576 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jun 8, 2014 10:36:33 PM (11 years ago)

Author:

vboxsync

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

94270

Message:

NAT/Net: Get rid of inet_ntop(3) (not available on Windows XP). Since
DPRINTFs now use Log*() calls we can use %RTnaipv4/%RTnaipv6.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• fwtcp.c (modified) (2 diffs)
• proxy.c (modified) (3 diffs)
• winutils.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/fwtcp.c

@@ -202 +202 @@
     struct sockaddr_storage ss;
     socklen_t sslen;
-    void *peer_addr;
-    uint16_t peer_port;
     struct pxtcp *pxtcp;
     SOCKET newsock;
@@ -229 +227 @@
     if (ss.ss_family == PF_INET) {
         struct sockaddr_in *peer4 = (struct sockaddr_in *)&ss;
-        peer_addr = &peer4->sin_addr;
-        peer_port = peer4->sin_port;
+        DPRINTF(("<--- TCP %RTnaipv4:%d\n",
+                 peer4->sin_addr.s_addr, ntohs(peer4->sin_port)));
     }
     else { /* PF_INET6 */
         struct sockaddr_in6 *peer6 = (struct sockaddr_in6 *)&ss;
-        peer_addr = &peer6->sin6_addr;
-        peer_port = peer6->sin6_port;
-    }
-    peer_port = ntohs(peer_port);
-
-#if PLEASE_ABSTAIN_FROM_DPRINFING > 1 /* DPRINTF */ && !defined(RT_OS_WINDOWS)
-    {
-        char addrbuf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-        const char *addrstr;
-
-        addrstr = inet_ntop(ss.ss_family, peer_addr, addrbuf, sizeof(addrbuf));
-        DPRINTF(("<--- TCP %s%s%s:%d\n",
-                 ss.ss_family == AF_INET6 ? "[" : "",
-                 addrstr,
-                 ss.ss_family == AF_INET6 ? "]" : "",
-                 peer_port));
-    }
-#endif  /* DPRINTF */
-
+        DPRINTF(("<--- TCP %RTnaipv6:%d\n",
+                 &peer6->sin6_addr, ntohs(peer6->sin6_port)));
+    }
 
     pxtcp = pxtcp_create_forwarded(newsock);

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -250 +250 @@
     LWIP_ASSERT1(stype == SOCK_STREAM || stype == SOCK_DGRAM);
 
+    DPRINTF(("---> %s ", stype == SOCK_STREAM ? "TCP" : "UDP"));
     if (sdom == PF_INET6) {
         pdst_sa = (struct sockaddr *)&dst_sin6;
@@ -262 +263 @@
         memcpy(&dst_sin6.sin6_addr, &dst_addr->ip6, sizeof(ip6_addr_t));
         dst_sin6.sin6_port = htons(dst_port);
+
+        DPRINTF(("[%RTnaipv6]:%d ", &dst_sin6.sin6_addr, dst_port));
     }
     else { /* sdom = PF_INET */
@@ -275 +278 @@
         dst_sin.sin_addr.s_addr = dst_addr->ip4.addr; /* byte-order? */
         dst_sin.sin_port = htons(dst_port);
-    }
-
-#if LWIP_PROXY_DEBUG && !RT_OS_WINDOWS
-    {
-        char addrbuf[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-        const char *addrstr;
-
-        addrstr = inet_ntop(sdom, pdst_addr, addrbuf, sizeof(addrbuf));
-        DPRINTF(("---> %s %s%s%s:%d ",
-                 stype == SOCK_STREAM ? "TCP" : "UDP",
-                 sdom == PF_INET6 ? "[" : "",
-                 addrstr,
-                 sdom == PF_INET6 ? "]" : "",
-                 dst_port));
-    }
-#endif
+
+        DPRINTF(("%RTnaipv4:%d ", dst_sin.sin_addr.s_addr, dst_port));
+    }
 
     s = proxy_create_socket(sdom, stype);

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

@@ -36 +36 @@
 #  define __func__ __FUNCTION__
 #  define __attribute__(x) /* IGNORE */
-
-/*
- * 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;
-}
-
 
 /**