Changeset 28138 in vbox

Timestamp:

Apr 9, 2010 11:49:05 AM (15 years ago)

Author:

vboxsync

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

59863

Message:

Main,NAT: Always pass the NAT network via CFGM. Use the network derived from the slot number as default.

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvNAT.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -1172 +1172 @@
     GET_STRING(rc, pThis, pCfg, "Network", szNetwork[0], sizeof(szNetwork));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        RTStrPrintf(szNetwork, sizeof(szNetwork), "10.0.%d.0/24", pDrvIns->iInstance + 2);
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT%d: Configuration error: "
+                                   "missing network"),
+                                   pDrvIns->iInstance, szNetwork);
 
     RTIPV4ADDR Network;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2599 +2599 @@
             {
                 rc = CFGMR3InsertStringW(pCfg, "Network", str);         RC_CHECK();
+            }
+            else
+            {
+                ULONG uSlot;
+                hrc = aNetworkAdapter->COMGETTER(Slot)(&uSlot);         H();
+                rc = CFGMR3InsertStringF(pCfg, "Network", "10.0.%d.0/24", uSlot+2); RC_CHECK();
             }
             STR_FREE();