Changeset 29662 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

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/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

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

@@ -1063 +1063 @@
 
             vboxNetFltDumpPacket(pSG, false, (fSrc & INTNETTRUNKDIR_HOST) ? "host" : "wire", 1);
-            pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, fSrc);
+            pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, fSrc);
 
             vboxNetFltLinuxDestroySG(pSG);
@@ -1107 +1107 @@
 
             vboxNetFltDumpPacket(pSG, false, (fSrc & INTNETTRUNKDIR_HOST) ? "host" : "wire", 1);
-            pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, fSrc);
+            pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, fSrc);
 
             vboxNetFltLinuxDestroySG(pSG);
@@ -1540 +1540 @@
 }
 
-int  vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst)
-{
+int  vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
+{
+    NOREF(pvIfData);
+
     struct net_device * pDev;
     int err;
@@ -1766 +1768 @@
 
 
-void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, INTNETIFHANDLE hIf, PCRTMAC pMac)
-{
-    NOREF(pThis); NOREF(hIf); NOREF(pMac);
-}
-
-
-int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, INTNETIFHANDLE hIf)
+void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
+{
+    NOREF(pThis); NOREF(pvIfData); NOREF(pMac);
+}
+
+
+int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **pvIfData)
 {
     /* Nothing to do */
-    NOREF(pThis); NOREF(hIf);
+    NOREF(pThis); NOREF(pvIf); NOREF(pvIfData);
     return VINF_SUCCESS;
 }
 
 
-int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, INTNETIFHANDLE hIf)
+int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
 {
     /* Nothing to do */
-    NOREF(pThis); NOREF(hIf);
+    NOREF(pThis); NOREF(pvIfData);
     return VINF_SUCCESS;
 }