Changeset 57913 in vbox

Timestamp:

Sep 27, 2015 2:43:54 AM (9 years ago)

Author:

vboxsync

Message:

VBoxNetAdp/darwin: Common pattern in the kernel code is

ifnet_set_flags(interface, ...);
ifnet_ioctl(interface, 0, SIOCSIFFLAGS, NULL);

Implement ifnet_ioctl_func and stub out this case so that
VBoxNetFlt-darwin.cpp doesn't complain that it failed to put vboxnet
into promiscuous mode.

File:

• trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (2 diffs)

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

@@ -215 +215 @@
 }
 
+
+static errno_t vboxNetAdpDarwinIfIOCtl(ifnet_t pIface, unsigned long uCmd, void *pvData)
+{
+    errno_t error = 0;
+
+    switch (uCmd)
+    {
+        /*
+         * Common pattern in the kernel code is:
+         *   ifnet_set_flags(interface, ...);
+         *   ifnet_ioctl(interface, 0, SIOCSIFFLAGS, NULL);
+         *
+         * Stub this case out so that VBoxNetFlt-darwin.cpp doesn't
+         * complain that it failed to put vboxnet into promiscuous
+         * mode.
+         */
+        case SIOCSIFFLAGS:
+            if (pvData != NULL)
+            {
+                error = ENOTSUP;
+            }
+            break;
+
+        default:
+            error = ether_ioctl(pIface, uCmd, pvData);
+            break;
+    }
+
+    return error;
+}
+
+
 int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
 {
@@ -252 +284 @@
     Params.framer = ether_frameout;
     Params.softc = pThis;
-    Params.ioctl = (ifnet_ioctl_func)ether_ioctl;
+    Params.ioctl = vboxNetAdpDarwinIfIOCtl;
     Params.set_bpf_tap = NULL;
     Params.detach = vboxNetAdpDarwinDetach;