Changeset 8341 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2008 7:55:58 PM (17 years ago)

Author:

vboxsync

Message:

NAT: set the MAC address during power-on as well for static IP configurations

File:

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

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

@@ -362 +362 @@
 }
 
+/**
+ * Get the MAC address into the slirp stack.
+ */
+static void drvNATSetMac(PDRVNAT pData)
+{
+    PDMMAC Mac;
+    if (pData->pConfig)
+        pData->pConfig->pfnGetMac(pData->pConfig, &Mac);
+    slirp_set_ethaddr(pData->pNATState, Mac.au8);
+}
+
 
 /**
@@ -371 +382 @@
 {
     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
-    PDMMAC  Mac;
-    if (pData->pConfig)
-        pData->pConfig->pfnGetMac(pData->pConfig, &Mac);
-    slirp_set_ethaddr(pData->pNATState, Mac.au8);
+    drvNATSetMac(pData);
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Some guests might not use DHCP to retrieve an IP but use a static IP.
+ */
+static DECLCALLBACK(void) drvNATPowerOn(PPDMDRVINS pDrvIns)
+{
+    PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
+    drvNATSetMac(pData);
 }
 
@@ -557 +575 @@
     NULL,
     /* pfnPowerOn */
-    NULL,
+    drvNATPowerOn,
     /* pfnReset */
     NULL,