Changeset 38370 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Aug 9, 2011 8:37:03 AM (13 years ago)

Author:

vboxsync

Message:

vboxnetadp: BPF support for vboxnetX devices (#5817)

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• darwin/VBoxNetFlt-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -24 +24 @@
 #include <iprt/assert.h>
 
+/* Copied from VBoxNetAdp/VBoxNetAdpInternal.h */
+#define VBOXNETADP_MAGIC           0x56424e41
 
 RT_C_DECLS_BEGIN

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -787 +787 @@
  * @param   fSrc            Where the packet (allegedly) comes from, one INTNETTRUNKDIR_* value.
  * @param   eProtocol       The protocol.
+ * @param   pIfNet          The network interface.
  */
 static errno_t vboxNetFltDarwinIffInputOutputWorker(PVBOXNETFLTINS pThis, mbuf_t pMBuf, void *pvFrame,
-                                                    uint32_t fSrc, protocol_family_t eProtocol)
+                                                    uint32_t fSrc, protocol_family_t eProtocol,
+                                                    ifnet_t pIfNet)
 {
     /*
@@ -838 +840 @@
         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, fSrc);
         if (fDropIt)
-            mbuf_freem(pMBuf);
+        {
+            /*
+             * Check is this interface belongs to vboxnetadp. We should not drop
+             * any packets before they get to vboxnetadp as it passes them to tap
+             * callbacks in order for BPF to work properly.
+             */
+            uint32_t *pMagic = (uint32_t *)ifnet_softc(pIfNet);
+            Log2(("vboxnetflt: pMagic=%p *pMagic=%x\n", pMagic, pMagic ? *pMagic : -1));
+            if (pMagic && *pMagic == VBOXNETADP_MAGIC)
+                fDropIt = false;
+            else
+                mbuf_freem(pMBuf);
+        }
     }
 
@@ -857 +871 @@
 
     NOREF(eProtocol);
-    NOREF(pIfNet);
-    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, NULL, INTNETTRUNKDIR_HOST, eProtocol);
+    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, NULL, INTNETTRUNKDIR_HOST, eProtocol, pIfNet);
 }
 
@@ -870 +883 @@
 {
     NOREF(eProtocol);
-    NOREF(pIfNet);
-    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, *ppchFrame, INTNETTRUNKDIR_WIRE, eProtocol);
+    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, *ppchFrame, INTNETTRUNKDIR_WIRE, eProtocol, pIfNet);
 }