Changeset 22375 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvNetSniffer.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (4 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)

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,

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3290 +3290 @@
 
     /* Get the properties we need from the adapter */
-    BOOL fCableConnected;
+    BOOL fCableConnected, fTraceEnabled;
     HRESULT rc = aNetworkAdapter->COMGETTER(CableConnected) (&fCableConnected);
     AssertComRC(rc);
+    if (SUCCEEDED(rc))
+    {
+        rc = aNetworkAdapter->COMGETTER(TraceEnabled) (&fTraceEnabled);
+        AssertComRC(rc);
+    }
     if (SUCCEEDED(rc))
     {
@@ -3336 +3341 @@
                     ComAssertRC(vrc);
                 }
+#ifdef VBOX_DYNAMIC_NET_ATTACH
+                if (RT_SUCCESS(vrc) && changeAdapter)
+                {
+                    VMSTATE enmVMState = VMR3GetState(mpVM);
+
+                    if (   enmVMState == VMSTATE_RUNNING
+                        || enmVMState == VMSTATE_SUSPENDED)
+                    {
+                        if (fTraceEnabled && fCableConnected && pINetCfg)
+                        {
+                            vrc = pINetCfg->pfnSetLinkState (pINetCfg, PDMNETWORKLINKSTATE_DOWN);
+                            ComAssertRC(vrc);
+                        }
+
+                        rc = doNetworkAdapterChange(pszAdapterName, ulInstance, 0, aNetworkAdapter);
+
+                        if (fTraceEnabled && fCableConnected && pINetCfg)
+                        {
+                            vrc = pINetCfg->pfnSetLinkState (pINetCfg, PDMNETWORKLINKSTATE_UP);
+                            ComAssertRC(vrc);
+                        }
+                    }
+                }
+#endif /* VBOX_DYNAMIC_NET_ATTACH */
             }
-
-#ifdef VBOX_DYNAMIC_NET_ATTACH
-            if (RT_SUCCESS(vrc) && changeAdapter)
-            {
-                VMSTATE enmVMState = VMR3GetState(mpVM);
-                if (   enmVMState == VMSTATE_RUNNING
-                    || enmVMState == VMSTATE_SUSPENDED)
-                    rc = doNetworkAdapterChange(pszAdapterName, ulInstance, 0, aNetworkAdapter);
-            }
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
             if (VBOX_FAILURE (vrc))
@@ -7624 +7643 @@
 };
 
+/**
+ * Initializing the attachment type for the network adapters
+ */
+NetworkAttachmentType_T Console::meAttachmentType[] = {};
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2117 +2117 @@
     H();
 
-    /*
-     * Detach the device train for the current network attachment.
-     */
-    if (fAttachDetach)
+    BOOL fSniffer;
+    hrc = aNetworkAdapter->COMGETTER(TraceEnabled)(&fSniffer);
+    H();
+
+    if (fAttachDetach && fSniffer)
+    {
+        const char *pszNetDriver = "IntNet";
+        if (meAttachmentType[uInstance] == NetworkAttachmentType_NAT)
+            pszNetDriver = "NAT";
+#if !defined(VBOX_WITH_NETFLT) && defined(RT_OS_LINUX)
+        if (meAttachmentType[uInstance] == NetworkAttachmentType_Bridged)
+            pszNetDriver = "HostInterface";
+#endif
+
+        rc = PDMR3DriverDetach(pVM, pszDevice, uInstance, uLun, pszNetDriver, 0, 0 /*fFlags*/);
+        if (rc == VINF_PDM_NO_DRIVER_ATTACHED_TO_LUN)
+            rc = VINF_SUCCESS;
+        AssertLogRelRCReturn(rc, rc);
+
+        pLunL0 = CFGMR3GetChildF(pInst, "LUN#%u", uLun);
+        CFGMR3RemoveNode(CFGMR3GetChildF(pLunL0, "AttachedDriver"));
+    }
+    else if (fAttachDetach && !fSniffer)
     {
         rc = PDMR3DeviceDetach(pVM, pszDevice, uInstance, uLun, 0 /*fFlags*/);
@@ -2130 +2149 @@
         CFGMR3RemoveNode(CFGMR3GetChildF(pInst, "LUN#%u", uLun));
     }
-
-    /*
-     * Enable the packet sniffer if requested.
-     */
-    BOOL fSniffer;
-    hrc = aNetworkAdapter->COMGETTER(TraceEnabled)(&fSniffer);
-    H();
-    if (fSniffer)
+    else if (!fAttachDetach && fSniffer)
     {
         /* insert the sniffer filter driver. */
@@ -2770 +2782 @@
                 if (fAttachDetach)
                 {
-                    rc = PDMR3DeviceAttach(pVM, pszDevice, uInstance, uLun, 0 /*fFlags*/, NULL /*ppBase*/);
+                    rc = PDMR3DriverAttach(pVM, pszDevice, uInstance, uLun, 0 /*fFlags*/, NULL /* ppBase */);
                     AssertRC(rc);
                 }
@@ -2818 +2830 @@
     }
 
+    meAttachmentType[uInstance] = eAttachmentType;
+
 #undef STR_FREE
 #undef H

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -557 +557 @@
     DriveState_T meFloppyState;
 
+    /** The current network attachment type in the VM.
+     * This doesn't have to match the network attachment type
+     * maintained in the NetworkAdapter. This is needed to
+     * change the network attachment dynamically.
+     */
+    static NetworkAttachmentType_T meAttachmentType[SchemaDefs::NetworkAdapterCount];
+
     VMMDev * const mVMMDev;
     AudioSniffer * const mAudioSniffer;