Changeset 9472 in vbox for trunk/src

Timestamp:

Jun 6, 2008 12:45:52 PM (17 years ago)

Author:

vboxsync

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

31730

Message:

NAT: fixed default guest IP address for port forwarding if the NAT network was changed

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -293 +293 @@
  * @param   pCfgHandle      The drivers configuration handle.
  */
-static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pData, PCFGMNODE pCfgHandle)
+static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pData, PCFGMNODE pCfgHandle, RTIPV4ADDR Network)
 {
     /*
@@ -346 +346 @@
         rc = CFGMR3QueryString(pNode, "GuestIP", &szGuestIP[0], sizeof(szGuestIP));
         if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-            strcpy(szGuestIP, "10.0.2.15");
+            RTStrPrintf(szGuestIP, sizeof(szGuestIP), "%d.%d.%d.%d",
+                        (Network & 0xFF000000) >> 24, (Network & 0xFF0000) >> 16, (Network & 0xFF00), (Network & 0xE0) | 15);
         else if (VBOX_FAILURE(rc))
             return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"GuestIP\" string failed"), iInstance);
@@ -507 +508 @@
             if (VBOX_SUCCESS(rc))
             {
-                int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pData, pCfgHandle);
+                int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pData, pCfgHandle, Network);
                 if (VBOX_SUCCESS(rc2))
                 {