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

Timestamp:

Jun 30, 2008 9:05:06 AM (17 years ago)

Author:

vboxsync

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

32477

Message:

netsniffer: implemented missing config interface allow to sniffing NAT-bound network cards

File:

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

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

@@ -52 +52 @@
     /** The network interface. */
     PDMINETWORKPORT         INetworkPort;
+    /** The network config interface. */
+    PDMINETWORKCONFIG       INetworkConfig;
     /** The port we're attached to. */
     PPDMINETWORKPORT        pPort;
+    /** The config port interface we're attached to. */
+    PPDMINETWORKCONFIG      pConfig;
     /** The connector that's attached to us. */
     PPDMINETWORKCONNECTOR   pConnector;
@@ -72 +76 @@
 /** Converts a pointer to NAT::INetworkPort to a PDRVNETSNIFFER. */
 #define PDMINETWORKPORT_2_DRVNETSNIFFER(pInterface)         ( (PDRVNETSNIFFER)((uintptr_t)pInterface - RT_OFFSETOF(DRVNETSNIFFER, INetworkPort)) )
+
+/** Converts a pointer to NAT::INetworkConfig to a PDRVNETSNIFFER. */
+#define PDMINETWORKCONFIG_2_DRVNETSNIFFER(pInterface)       ( (PDRVNETSNIFFER)((uintptr_t)pInterface - RT_OFFSETOF(DRVNETSNIFFER, INetworkConfig)) )
 
 
@@ -240 +247 @@
 }
 
+
+/**
+ * Gets the current Media Access Control (MAC) address.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   pMac            Where to store the MAC address.
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvNetSnifferGetMac(PPDMINETWORKCONFIG pInterface, PPDMMAC pMac)
+{
+    PDRVNETSNIFFER pData = PDMINETWORKCONFIG_2_DRVNETSNIFFER(pInterface);
+    return pData->pConfig->pfnGetMac(pData->pConfig, pMac);
+}
+
+/**
+ * Gets the new link state.
+ *
+ * @returns The current link state.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @thread  EMT
+ */
+static DECLCALLBACK(PDMNETWORKLINKSTATE) drvNetSnifferGetLinkState(PPDMINETWORKCONFIG pInterface)
+{
+    PDRVNETSNIFFER pData = PDMINETWORKCONFIG_2_DRVNETSNIFFER(pInterface);
+    return pData->pConfig->pfnGetLinkState(pData->pConfig);
+}
+
+/**
+ * Sets the new link state.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   enmState        The new link state
+ * @thread  EMT
+ */
+static DECLCALLBACK(int) drvNetSnifferSetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
+{
+    PDRVNETSNIFFER pData = PDMINETWORKCONFIG_2_DRVNETSNIFFER(pInterface);
+    return pData->pConfig->pfnSetLinkState(pData->pConfig, enmState);
+}
+
+
 /**
  * Queries an interface to the driver.
@@ -261 +311 @@
         case PDMINTERFACE_NETWORK_PORT:
             return &pData->INetworkPort;
+        case PDMINTERFACE_NETWORK_CONFIG:
+            return &pData->INetworkConfig;
         default:
             return NULL;
@@ -325 +377 @@
     pData->INetworkPort.pfnWaitReceiveAvail         = drvNetSnifferWaitReceiveAvail;
     pData->INetworkPort.pfnReceive                  = drvNetSnifferReceive;
+    /* INetworkConfig */
+    pData->INetworkConfig.pfnGetMac                 = drvNetSnifferGetMac;
+    pData->INetworkConfig.pfnGetLinkState           = drvNetSnifferGetLinkState;
+    pData->INetworkConfig.pfnSetLinkState           = drvNetSnifferSetLinkState;
 
     /*
@@ -345 +401 @@
     {
         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.
+     */
+    pData->pConfig = (PPDMINETWORKCONFIG)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_NETWORK_CONFIG);
+    if (!pData->pConfig)
+    {
+        AssertMsgFailed(("Configuration error: the above device/driver didn't export the network config interface!\n"));
         return VERR_PDM_MISSING_INTERFACE_ABOVE;
     }