Changeset 8285 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 22, 2008 1:04:46 PM (17 years ago)

Author:

vboxsync

Message:

NAT: set network address after loadstate (fixed #2467)

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (7 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (1 diff)

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

@@ -48 +48 @@
     /** The port we're attached to. */
     PPDMINETWORKPORT        pPort;
+    /** The network config of the port we're attached to. */
+    PPDMINETWORKCONFIG      pConfig;
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
@@ -88 +90 @@
 static DECLCALLBACK(int) drvNATSend(PPDMINETWORKCONNECTOR pInterface, const void *pvBuf, size_t cb)
 {
-    PDRVNAT    pData = PDMINETWORKCONNECTOR_2_DRVNAT(pInterface);
+    PDRVNAT pData = PDMINETWORKCONNECTOR_2_DRVNAT(pInterface);
 
     LogFlow(("drvNATSend: pvBuf=%p cb=%#x\n", pvBuf, cb));
@@ -133 +135 @@
 static DECLCALLBACK(void) drvNATNotifyLinkChanged(PPDMINETWORKCONNECTOR pInterface, PDMNETWORKLINKSTATE enmLinkState)
 {
-    PDRVNAT    pData = PDMINETWORKCONNECTOR_2_DRVNAT(pInterface);
+    PDRVNAT pData = PDMINETWORKCONNECTOR_2_DRVNAT(pInterface);
 
     LogFlow(("drvNATNotifyLinkChanged: enmLinkState=%d\n", enmLinkState));
@@ -359 +361 @@
 }
 
+static DECLCALLBACK(int) drvNATLoadDone(PPDMDRVINS pDrvIns, PSSMHANDLE pSSMHandle)
+{
+    PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
+    PDMMAC  Mac;
+    if (pData->pConfig)
+        pData->pConfig->pfnGetMac(pData->pConfig, &Mac);
+    slirp_set_ethaddr(pData->pNATState, Mac.au8);
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -420 +432 @@
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE,
                                 N_("Configuration error: the above device/driver didn't export the network port interface"));
+    pData->pConfig = (PPDMINETWORKCONFIG)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_NETWORK_CONFIG);
+    if (!pData->pConfig)
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE,
+                                N_("Configuration error: the above device/driver didn't export the network config interface"));
 
     /* Generate a network address for this network card. */
@@ -451 +467 @@
                 if (VBOX_SUCCESS(rc2))
                 {
+                    rc2 = pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, pDrvIns->pDrvReg->szDriverName, 0, 0,
+                                                           pDrvIns->iInstance, NULL, NULL, NULL, NULL, NULL, 
+                                                           drvNATLoadDone);
+                    AssertRC(rc2);
                     pDrvIns->pDrvHlp->pfnPDMPollerRegister(pDrvIns, drvNATPoller);
 
@@ -462 +482 @@
                 }
                 /* failure path */
+                rc = rc2;
                 slirp_term(pData->pNATState);
                 pData->pNATState = NULL;

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -38 +38 @@
 
 void slirp_input(PNATState pData, const uint8_t *pkt, int pkt_len);
+void slirp_set_ethaddr(PNATState pData, const uint8_t *ethaddr);
 
 /* you must provide the following functions: */

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -812 +812 @@
                     addr_low_byte, htons(guest_port));
 }
+
+void slirp_set_ethaddr(PNATState pData, const uint8_t *ethaddr)
+{
+    memcpy(client_ethaddr, ethaddr, ETH_ALEN);
+}