Changeset 29662 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

Timestamp:

May 19, 2010 2:46:02 PM (15 years ago)

Author:

vboxsync

Message:

IntNet: Added Interface, Interface private data passing for per-interface based VBoxNetFlt.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (8 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

@@ -433 +433 @@
  * @copydoc INTNETTRUNKIFPORT::pfnXmit
  */
-static DECLCALLBACK(int) vboxNetFltPortXmit(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG, uint32_t fDst)
+static DECLCALLBACK(int) vboxNetFltPortXmit(PINTNETTRUNKIFPORT pIfPort, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -454 +454 @@
         if (    !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost)
             ||  vboxNetFltMaybeRediscovered(pThis))
-            rc = vboxNetFltPortOsXmit(pThis, pSG, fDst);
+            rc = vboxNetFltPortOsXmit(pThis, pvIfData, pSG, fDst);
         vboxNetFltRelease(pThis, true /* fBusy */);
     }
@@ -537 +537 @@
  * @copydoc INTNETTRUNKIFPORT::pfnNotifyMacAddress
  */
-static DECLCALLBACK(void) vboxNetFltPortNotifyMacAddress(PINTNETTRUNKIFPORT pIfPort, INTNETIFHANDLE hIf, PCRTMAC pMac)
+static DECLCALLBACK(void) vboxNetFltPortNotifyMacAddress(PINTNETTRUNKIFPORT pIfPort, void *pvIfData, PCRTMAC pMac)
 {
     PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -548 +548 @@
 
     vboxNetFltRetain(pThis, false /* fBusy */);
-    vboxNetFltPortOsNotifyMacAddress(pThis, hIf, pMac);
+    vboxNetFltPortOsNotifyMacAddress(pThis, pvIfData, pMac);
     vboxNetFltRelease(pThis, false /* fBusy */);
 }
@@ -556 +556 @@
  * @copydoc INTNETTRUNKIFPORT::pfnConnectInterface
  */
-static DECLCALLBACK(int) vboxNetFltPortConnectInterface(PINTNETTRUNKIFPORT pIfPort,  INTNETIFHANDLE hIf)
+static DECLCALLBACK(int) vboxNetFltPortConnectInterface(PINTNETTRUNKIFPORT pIfPort, void *pvIf, void *ppvIfData, INTNETIFHANDLE hIf)
 {
     PVBOXNETFLTINS  pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -568 +568 @@
 
     vboxNetFltRetain(pThis, false /* fBusy */);
-    rc = vboxNetFltPortOsConnectInterface(pThis, hIf);
+    rc = vboxNetFltPortOsConnectInterface(pThis, pvIf, ppvIfData);
     vboxNetFltRelease(pThis, false /* fBusy */);
 
@@ -578 +578 @@
  * @copydoc INTNETTRUNKIFPORT::pfnDisconnectInterface
  */
-static DECLCALLBACK(void) vboxNetFltPortDisconnectInterface(PINTNETTRUNKIFPORT pIfPort, INTNETIFHANDLE hIf)
+static DECLCALLBACK(void) vboxNetFltPortDisconnectInterface(PINTNETTRUNKIFPORT pIfPort, void *pvIfData)
 {
     PVBOXNETFLTINS  pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
@@ -590 +590 @@
 
     vboxNetFltRetain(pThis, false /* fBusy */);
-    rc = vboxNetFltPortOsDisconnectInterface(pThis, hIf);
+    rc = vboxNetFltPortOsDisconnectInterface(pThis, pvIfData);
     vboxNetFltRelease(pThis, false /* fBusy */);
     AssertRC(rc); /** @todo fix vboxNetFltPortOsDisconnectInterface. */