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

Timestamp:

Aug 10, 2011 8:07:04 PM (13 years ago)

Author:

vboxsync

Message:

vboxnetflt: partial BPF support for bridged interfaces (#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,
-                                                    ifnet_t pIfNet)
+                                                    uint32_t fSrc, protocol_family_t eProtocol)
 {
     /*
@@ -842 +840 @@
         {
             /*
-             * Check is this interface belongs to vboxnetadp. We should not drop
-             * any packets before they get to vboxnetadp as it passes them to tap
+             * Check if this interface is in promiscuous mode. We should not drop
+             * any packets before they get to the driver 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)
+            if (vboxNetFltDarwinIsPromiscuous(pThis))
                 fDropIt = false;
             else
@@ -871 +867 @@
 
     NOREF(eProtocol);
-    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, NULL, INTNETTRUNKDIR_HOST, eProtocol, pIfNet);
+    NOREF(pIfNet);
+    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, NULL, INTNETTRUNKDIR_HOST, eProtocol);
 }
 
@@ -883 +880 @@
 {
     NOREF(eProtocol);
-    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, *ppchFrame, INTNETTRUNKDIR_WIRE, eProtocol, pIfNet);
+    NOREF(pIfNet);
+    return vboxNetFltDarwinIffInputOutputWorker((PVBOXNETFLTINS)pvThis, *ppMBuf, *ppchFrame, INTNETTRUNKDIR_WIRE, eProtocol);
 }