Changeset 57907 in vbox

Timestamp:

Sep 26, 2015 3:35:03 AM (9 years ago)

Author:

vboxsync

Message:

VBoxNetAdp/darwin: use bpfattach() without tap and send callbacks.
Default behavior is fine and we get bpf packet injection for free.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp

Files:

• VBoxNetAdpInternal.h (modified) (1 diff)
• darwin/VBoxNetAdp-darwin.cpp (modified) (4 diffs)

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

@@ -104 +104 @@
             /** 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

@@ -51 +51 @@
 #include <sys/conf.h>
 #include <miscfs/devfs/devfs.h>
-extern "C" {
+RT_C_DECLS_BEGIN
 #include <net/bpf.h>
-}
+RT_C_DECLS_END
 
 #define VBOXNETADP_OS_SPECFIC 1
@@ -210 +210 @@
 }
 
-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)
 {
@@ -241 +224 @@
         return rc;
     }
-
-    pThis->u.s.nTapMode = BPF_MODE_DISABLED;
 
     mac.sdl_len = sizeof(mac);
@@ -279 +260 @@
         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));
-            }
+            bpfattach(pThis->u.s.pIface, DLT_EN10MB, ETHER_HDR_LEN);
+
             err = ifnet_set_flags(pThis->u.s.pIface, IFF_RUNNING | IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, 0xFFFF);
             if (!err)