Changeset 50321 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin

Timestamp:

Feb 5, 2014 8:30:46 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92043

Message:

Mac OS X host: prevent stuck-in-dock: r91968 is substituted with the new solution: send dummy packet in a context of a kernel thread in order to associate interface's receive thread w/ our new kernel thread instead of VirtualBoxVM process.

File:

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

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

@@ -32 +32 @@
 #include <VBox/err.h>
 #include <VBox/version.h>
+#include <VBox/VBoxNetSend.h>
 #include <iprt/assert.h>
 #include <iprt/initterm.h>
@@ -233 +234 @@
 }
 
-
-/**
- * Constructs and submits a dummy packet to ifnet_input(). This is a workaround
- * for "stuck dock icon" issue. When the first packet goes through the interface
- * DLIL grabs a reference to the thread that submits the packet and holds it
- * until the interface is destroyed. By submitting this dummy we make DLIL grab
- * the thread of a non-GUI process.
- *
- * Most of this function was copied from vboxNetFltDarwinMBufFromSG().
- *
- * @returns VBox status code.
- * @param   pIfNet      The interface that will hold the reference to the calling
- *                      thread. We submit dummy as if it was coming from this interface.
- */
-static int vboxNetSendDummy(ifnet_t pIfNet)
-{
-    int rc = 0;
-    size_t cbTotal = 50; /* No Ethernet header */
-    mbuf_how_t How = MBUF_WAITOK;
-
-    mbuf_t pPkt = NULL;
-    errno_t err = mbuf_allocpacket(How, cbTotal, NULL, &pPkt);
-    if (!err)
-    {
-        /* Skip zero sized memory buffers (paranoia). */
-        mbuf_t pCur = pPkt;
-        while (pCur && !mbuf_maxlen(pCur))
-            pCur = mbuf_next(pCur);
-        Assert(pCur);
-
-        /* Set the required packet header attributes. */
-        mbuf_pkthdr_setlen(pPkt, cbTotal);
-        mbuf_pkthdr_setheader(pPkt, mbuf_data(pCur));
-
-        mbuf_setlen(pCur, cbTotal);
-        memset(mbuf_data(pCur), 0, cbTotal);
-
-        mbuf_pkthdr_setrcvif(pPkt, pIfNet); /* will crash without this. */
-
-        errno_t err = ifnet_input(pIfNet, pPkt, NULL);
-        if (err)
-        {
-            rc = RTErrConvertFromErrno(err);
-            mbuf_freem(pPkt);
-        }
-    }
-    else
-        rc = RTErrConvertFromErrno(err);
-
-    return rc;
-}
 
 int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
@@ -347 +297 @@
             {
                 ifnet_set_mtu(pThis->u.s.pIface, VBOXNETADP_MTU);
-                vboxNetSendDummy(pThis->u.s.pIface);
+                VboxNetSendDummy(pThis->u.s.pIface);
                 return VINF_SUCCESS;
             }