Changeset 50459 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Feb 14, 2014 3:14:24 AM (11 years ago)

Author:

vboxsync

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

92290

Message:

G/c uPfrHostAddr and uPfrGuestAddr from struct PORTFORWARDRULE.

Clients either only need string versions or parse string versions
themselves. Ironically, this kills the only (#if0'ed) reference to
RTNetStrToIPv6Addr from the tree that was my initial motivation to
write one. :)

As a side effect natnet IPv6 port-forwarding now works.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetPortForwardString.cpp (modified) (1 diff)
• VBoxPortForwardString.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -322 +322 @@
     pPfr->iPfrProto = proto;
 
-
-    if (strlen(pszHostAddr))
-    {
-        if (!fIPv6)
-            rc = RTNetStrToIPv4Addr(pszHostAddr, &pPfr->uPfrHostAddr.IPv4);
-#if 0 /* No IPv6 yet */
-        else
-            rc = RTNetStrToIPv6Addr(pszHostAddr, &pPfr->uPfrHostAddr.IPv6);
-#endif
-
-        if (RT_FAILURE(rc))
-            goto invalid_parameter;
-    }
-
     pPfr->u16PfrHostPort = u16HostPort;
 
-    if (strlen(pszGuestAddr))
-    {
-        if (!fIPv6)
-            rc = RTNetStrToIPv4Addr(pszGuestAddr, &pPfr->uPfrGuestAddr.IPv4);
-#if 0
-        else
-            rc = RTNetStrToIPv6Addr(pszGuestAddr, &pPfr->uPfrGuestAddr.IPv6);
-#endif
-        if (RT_FAILURE(rc))
-            goto invalid_parameter;
-    }
-    else
+    if (*pszGuestAddr == '\0')
         goto invalid_parameter; /* guest address should be defined */
 

trunk/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h

@@ -43 +43 @@
     /* IPPROTO_{UDP,TCP} */
     int        iPfrProto;
-    RTNETADDRU uPfrHostAddr;
     char       szPfrHostAddr[INET6_ADDRSTRLEN];
     uint16_t   u16PfrHostPort;
-    RTNETADDRU uPfrGuestAddr;
     char       szPfrGuestAddr[INET6_ADDRSTRLEN];
     uint16_t   u16PfrGuestPort;