Changeset 22375 in vbox for trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

Timestamp:

Aug 20, 2009 1:42:49 PM (16 years ago)

Author:

vboxsync

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

51307

Message:

NetSniffer: do not erase the dump file even if network attachment is changed

File:

• trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp (modified) (2 diffs)

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

@@ -277 +277 @@
 
 /**
+ * Detach a driver instance.
+ *
+ * @param   pDrvIns     The driver instance.
+ * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
+ */
+static DECLCALLBACK(void) drvNetSnifferDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+{
+    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
+
+    LogFlow(("drvNetSnifferDetach: pDrvIns: %p, fFlags: %u\n", pDrvIns, fFlags));
+
+    pThis->pConnector = NULL;
+    pThis->pPort      = NULL;
+    pThis->pConfig    = NULL;
+}
+
+
+/**
+ * Attach a driver instance.
+ *
+ * @returns VBox status code.
+ * @param   pDrvIns     The driver instance.
+ * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
+ */
+static DECLCALLBACK(int) drvNetSnifferAttach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+{
+    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
+
+    LogFlow(("drvNetSnifferAttach: pDrvIns: %p, fFlags: %u\n", pDrvIns, fFlags));
+
+    /*
+     * Query the network port interface.
+     */
+    pThis->pPort = (PPDMINETWORKPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_NETWORK_PORT);
+    if (!pThis->pPort)
+    {
+        AssertMsgFailed(("Configuration error: the above device/driver didn't export the network port interface!\n"));
+        return VERR_PDM_MISSING_INTERFACE_ABOVE;
+    }
+
+    /*
+     * Query the network config interface.
+     */
+    pThis->pConfig = (PPDMINETWORKCONFIG)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_NETWORK_CONFIG);
+    if (!pThis->pConfig)
+    {
+        AssertMsgFailed(("Configuration error: the above device/driver didn't export the network config interface!\n"));
+        return VERR_PDM_MISSING_INTERFACE_ABOVE;
+    }
+
+    /*
+     * Query the network connector interface.
+     */
+    PPDMIBASE   pBaseDown;
+    int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pBaseDown);
+    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+        pThis->pConnector = NULL;
+    else if (RT_SUCCESS(rc))
+    {
+        pThis->pConnector = (PPDMINETWORKCONNECTOR)pBaseDown->pfnQueryInterface(pBaseDown, PDMINTERFACE_NETWORK_CONNECTOR);
+        if (!pThis->pConnector)
+        {
+            AssertMsgFailed(("Configuration error: the driver below didn't export the network connector interface!\n"));
+            return VERR_PDM_MISSING_INTERFACE_BELOW;
+        }
+    }
+    else
+    {
+        AssertMsgFailed(("Failed to attach to driver below! rc=%Rrc\n", rc));
+        return rc;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Destruct a driver instance.
  *
@@ -454 +531 @@
     NULL,
     /* pfnAttach */
-    NULL,
+    drvNetSnifferAttach,
     /* pfnDetach */
-    NULL, 
+    drvNetSnifferDetach,
     /* pfnPowerOff */
-    NULL, 
+    NULL,
     /* pfnSoftReset */
     NULL,