Changeset 49022 in vbox for trunk/src/VBox

Timestamp:

Oct 10, 2013 9:23:49 AM (11 years ago)

Author:

vboxsync

Message:

VBoxNetNAT/Win: removes inet_pton's Vista limitation, instead WSAStringToAddressA (minimum supported version is Win2k) is used. (tested for IPv4, in documentation (​http://msdn.microsoft.com/en-us/library/windows/desktop/ms742214%28v=vs.85%29.aspx) hasn't mentioned any IPv6 limitations)

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• portfwd.c (modified) (2 diffs)
• winutils.h (modified) (1 diff)

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

@@ -127 +127 @@
 
 
+#ifndef RT_OS_WINDOWS
 int
 fwspec_set(struct fwspec *fwspec, int sdom, int stype,
@@ -199 +200 @@
     return 0;
 }
+#else  /* RT_OS_WINDOWS */
+/**
+ * Windows only provides inet_pton() since Vista, but XP already has
+ * WSAStringToAddressA() that does what we want (NB: its AddressString
+ * argument is not declared const).
+ */
+int
+fwspec_set(struct fwspec *fwspec, int sdom, int stype,
+           const char *src_addr_str, uint16_t src_port,
+           const char *dst_addr_str, uint16_t dst_port)
+{
+    int saf;
+    int socklen;
+    int status;
+
+    LWIP_ASSERT1(sdom == PF_INET || sdom == PF_INET6);
+    LWIP_ASSERT1(stype == SOCK_STREAM || stype == SOCK_DGRAM);
+
+    fwspec->sdom = sdom;
+    fwspec->stype = stype;
+
+    saf = (sdom == PF_INET) ? AF_INET : AF_INET6;
+
+    socklen = sizeof(fwspec->src);
+    fwspec->src.sa.sa_family = saf; /* see "Remarks" WSAStringToAddress */
+    status = WSAStringToAddressA((char *)src_addr_str, saf, NULL,
+                                  &fwspec->src.sa, &socklen);
+    if (status == SOCKET_ERROR) {
+        int error = WSAGetLastError();
+        return -1;
+    }
+    
+    if (fwspec->src.sa.sa_family != saf) {
+        return -1;
+    }
+
+    fwspec->dst.sa.sa_family = saf;
+    socklen = sizeof(fwspec->dst);
+    status = WSAStringToAddressA((char *)dst_addr_str, saf, NULL,
+                                &fwspec->dst.sa, &socklen);
+    if (status == SOCKET_ERROR) {
+        int error = WSAGetLastError();
+        return -1;
+    }
+    if (fwspec->dst.sa.sa_family != saf) {
+        return -1;
+    }
+
+    if (sdom == PF_INET) {
+        fwspec->src.sin.sin_port = htons(src_port);
+        fwspec->dst.sin.sin_port = htons(dst_port); 
+    }
+    else { /* PF_INET6 */
+        fwspec->src.sin6.sin6_port = htons(src_port);
+        fwspec->dst.sin6.sin6_port = htons(dst_port); 
+    }
+
+    return 0;
+}
+#endif /* RT_OS_WINDOWS */
 
 

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

@@ -36 +36 @@
 #  define inet_ntop(dom, pvaddr, pstrbuf, cbstrbuf) InetNtop((dom),(pvaddr),(pstrbuf),(cbstrbuf))
 
-/**
- * inet_pton(3) returns 1 on success (network address was successfully
- * converted).  0 is returned if src does not contain a character string
- * representing a valid network address in the specified address family.
- * If af does not contain a valid address family, -1 is returned and
- * errno is set to EAFNOSUPPORT(value 97).
- * WSA has value most close in our case
- * http://msdn.microsoft.com/en-us/library/windows/desktop/ms740668(v=vs.85).aspx#WSAEAFNOSUPPORT (10047)
- */
-DECLINLINE(int) inet_pton(int af_family, const char *str, void *dst)
-{
-    AssertPtrReturn(str, 0);
-    AssertPtrReturn(dst, 0);
-
-    switch (af_family) {
-    case AF_INET: {
-      RTNETADDRIPV4 a4;
-      int rc = RTNetStrToIPv4Addr(str, &a4);
-      AssertRCReturn(rc, -1);
-      memcpy(dst, &a4, sizeof(RTNETADDRIPV4));
-      break;
-    }
-    case AF_INET6: {
-#if 0
-      RTNETADDRIPV6 a6;
-      int rc = RTNetStrToIPv6Addr(str, &a6);
-      AssertRCReturn(rc, -1);
-      memcpy(dst, &a6, sizeof(RTNETADDRIPV6));
-#else
-      /* XXX: RTNetStrToIPv6Addr isn't implemented yet. */
-      WSASetLastError(WSAEAFNOSUPPORT);
-      return -1;
-#endif
-      break;
-    }
-    default:
-      WSASetLastError(WSAEAFNOSUPPORT);
-      AssertMsgFailedReturn(("Unsupported internet family"), -1);
-    }
-    return 1;
-}
 
 /**