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

Timestamp:

Oct 10, 2013 12:05:52 PM (11 years ago)

Author:

vboxsync

Message:

portfwd.c: G/c:

1. same order of assignments before WSAStringToAddressA in "source" and "destination" parts.
2. Drops check of socket address family check after WSAStringToAddressA.
3. Drops half-comment-link to remark to WSAEINVAL error code of WSAStringToAddressA.

File:

• trunk/src/VBox/NetworkServices/NAT/portfwd.c (modified) (2 diffs)

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

@@ -223 +223 @@
     saf = (sdom == PF_INET) ? AF_INET : AF_INET6;
 
+    fwspec->src.sa.sa_family = saf;
     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) {
-        return -1;
-    }
-    
-    if (fwspec->src.sa.sa_family != saf) {
         return -1;
     }
@@ -240 +236 @@
                                 &fwspec->dst.sa, &socklen);
     if (status == SOCKET_ERROR) {
-        return -1;
-    }
-    if (fwspec->dst.sa.sa_family != saf) {
         return -1;
     }