Changeset 38370 in vbox for trunk

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

Files:

• VBoxNetAdp/VBoxNetAdp.c (modified) (1 diff)
• VBoxNetAdp/VBoxNetAdpInternal.h (modified) (3 diffs)
• VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (6 diffs)
• VBoxNetFlt/VBoxNetFltInternal.h (modified) (1 diff)
• VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c

@@ -1197 +1197 @@
     for (i = 0; i < RT_ELEMENTS(g_aAdapters); i++)
     {
+        g_aAdapters[i].uMagic   = VBOXNETADP_MAGIC;
         g_aAdapters[i].enmState = kVBoxNetAdpState_Invalid;
         g_aAdapters[i].iUnit    = -1;

trunk/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h

@@ -30 +30 @@
 typedef struct VBOXNETADPGLOBALS *PVBOXNETADPGLOBALS;
 
+/* WARNING! There a copy of VBOXNETADP_MAGIC in VBoxNetFlt/VBoxNetFltInternal.h! */
+/*                                   v b n a */
+#define VBOXNETADP_MAGIC           0x56424e41
 #define VBOXNETADP_MAX_INSTANCES   8
 #define VBOXNETADP_MAX_UNITS       128
@@ -83 +86 @@
 struct VBoxNetAdapter
 {
+    /** Magic id to tell vboxnetX interfaces apart. */
+    uint32_t          uMagic;
     /** Denotes availability of this slot in adapter array. */
     VBOXNETADPSTATE   enmState;
@@ -104 +109 @@
             /** Protocol families attached to this adapter. */
             protocol_family_t aAttachedFamilies[VBOXNETADP_MAX_FAMILIES];
+            /** Packet sniffer mode. */
+            bpf_tap_mode      nTapMode;
             /** @} */
 # elif defined(RT_OS_LINUX)

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

@@ -55 +55 @@
 #include <sys/conf.h>
 #include <miscfs/devfs/devfs.h>
+extern "C" {
+#include <net/bpf.h>
+}
 
 #define VBOXNETADP_OS_SPECFIC 1
@@ -142 +145 @@
 static errno_t vboxNetAdpDarwinOutput(ifnet_t pIface, mbuf_t pMBuf)
 {
+    PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
+    Assert(pThis);
+    if (pThis->u.s.nTapMode & BPF_MODE_OUTPUT)
+    {
+        Log2(("vboxnetadp: out len=%d\n%.*Rhxd\n", mbuf_len(pMBuf), 14, mbuf_data(pMBuf)));
+        bpf_tap_out(pIface, DLT_EN10MB, pMBuf, NULL, 0);
+    }
     mbuf_freem_list(pMBuf);
     return 0;
@@ -192 +202 @@
 }
 
-
+static errno_t vboxNetAdpDarwinDemux(ifnet_t pIface, mbuf_t pMBuf,
+                                     char *pFrameHeader,
+                                     protocol_family_t *pProtocolFamily)
+{
+    PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
+    Assert(pThis);
+    Log2(("vboxNetAdpDarwinDemux: mode=%d\n", nMode));
+    if (pThis->u.s.nTapMode & BPF_MODE_INPUT)
+    {
+        Log2(("vboxnetadp: in len=%d\n%.*Rhxd\n", mbuf_len(pMBuf), 14, pFrameHeader));
+        bpf_tap_in(pIface, DLT_EN10MB, pMBuf, pFrameHeader, ETHER_HDR_LEN);
+    }
+    return ether_demux(pIface, pMBuf, pFrameHeader, pProtocolFamily);
+}
+
+static errno_t vboxNetAdpDarwinBpfTap(ifnet_t pIface, u_int32_t uLinkType, bpf_tap_mode nMode)
+{
+    PVBOXNETADP pThis = VBOXNETADP_FROM_IFACE(pIface);
+    Assert(pThis);
+    Log2(("vboxNetAdpDarwinBpfTap: mode=%d\n", nMode));
+    pThis->u.s.nTapMode = nMode;
+    return 0;
+}
+
+static errno_t vboxNetAdpDarwinBpfSend(ifnet_t pIface, u_int32_t uLinkType, mbuf_t pMBuf)
+{
+    LogRel(("vboxnetadp: BPF send function is not implemented (dlt=%d)\n", uLinkType));
+    mbuf_freem_list(pMBuf);
+    return 0;
+}
 
 int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
@@ -208 +247 @@
         return rc;
     }
+
+    pThis->u.s.nTapMode = BPF_MODE_DISABLED;
 
     mac.sdl_len = sizeof(mac);
@@ -225 +266 @@
     Params.type = IFT_ETHER;
     Params.output = vboxNetAdpDarwinOutput;
-    Params.demux = ether_demux;
+    Params.demux = vboxNetAdpDarwinDemux;
     Params.add_proto = vboxNetAdpDarwinAddProto;
     Params.del_proto = vboxNetAdpDarwinDelProto;
@@ -244 +285 @@
         if (!err)
         {
+            err = bpf_attach(pThis->u.s.pIface, DLT_EN10MB, ETHER_HDR_LEN,
+                      vboxNetAdpDarwinBpfSend, vboxNetAdpDarwinBpfTap);
+            if (err)
+            {
+                LogRel(("vboxnetadp: bpf_attach failed with %d\n", err));
+            }
             err = ifnet_set_flags(pThis->u.s.pIface, IFF_RUNNING | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, 0xFFFF);
             if (!err)
             {
                 ifnet_set_mtu(pThis->u.s.pIface, VBOXNETADP_MTU);
+                Log2(("vboxnetadp: created interface %s (%p), pThis=%p, pMagic=%p, *pMagic=%x(%x)\n",
+                        pThis->szName, pThis->u.s.pIface, pThis, ifnet_softc(pThis->u.s.pIface), *(uint32_t*)ifnet_softc(pThis->u.s.pIface), pThis->uMagic));
                 return VINF_SUCCESS;
             }

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);
 }