Index: /trunk/include/VBox/VBoxNetSend.h =================================================================== --- /trunk/include/VBox/VBoxNetSend.h (revision 50321) +++ /trunk/include/VBox/VBoxNetSend.h (revision 50321) @@ -0,0 +1,104 @@ +/* $Id$ */ +/** @file + * A place to share code and definitions between VBoxNetAdp and VBoxNetFlt host drivers. + */ + +/* + * Copyright (C) 2014 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + +#ifndef __VBoxNetSend_h__ +#define __VBoxNetSend_h__ + +#if defined(RT_OS_DARWIN) + +#include +#include +#include + +#include +#include +RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */ +#include +RT_C_DECLS_END +#include + +RT_C_DECLS_BEGIN + +#if defined(IN_RING0) + +/** + * 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. + */ +inline 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; +} + +#endif /* IN_RING0 */ + +RT_C_DECLS_END + +#endif /* RT_OS_DARWIN */ + +#endif /* __VBoxNetSend_h__ */ Index: /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (revision 50320) +++ /trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (revision 50321) @@ -32,4 +32,5 @@ #include #include +#include #include #include @@ -233,55 +234,4 @@ } - -/** - * 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,5 +297,5 @@ { ifnet_set_mtu(pThis->u.s.pIface, VBOXNETADP_MTU); - vboxNetSendDummy(pThis->u.s.pIface); + VboxNetSendDummy(pThis->u.s.pIface); return VINF_SUCCESS; } Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (revision 50320) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (revision 50321) @@ -35,4 +35,5 @@ #include #include +#include #include #include @@ -44,4 +45,5 @@ #include #include +#include #include @@ -883,4 +885,41 @@ +/** A worker for vboxNetFltSendDummy() thread. */ +static int vboxNetFltSendDummyWorker(RTTHREAD ThreadSelf, void *pvUser) +{ + Assert(pvUser); + ifnet_t pIfNet = (ifnet_t)pvUser; + return VboxNetSendDummy(pIfNet); +} + +/* + * Prevent GUI icon freeze issue when VirtualBoxVM process terminates. + * + * This function is a workaround for stuck-in-dock issue. The + * idea here is to send a dummy packet to an interface from the + * context of a kernel thread. Therefore, an XNU's receive + * thread (which is created as a result if we are the first who + * is communicating with the interface) will be associated with the + * kernel thread instead of VirtualBoxVM process. + * + * @param pIfNet Interface to be used to send data. + */ +static void vboxNetFltSendDummy(ifnet_t pIfNet) +{ + RTTHREAD dummyThread; + int rc; + + rc = RTThreadCreate(&dummyThread, vboxNetFltSendDummyWorker, (void *)pIfNet, 0, + RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "DummyThread"); + + if (RT_SUCCESS(rc)) + { + RTThreadWait(dummyThread, RT_INDEFINITE_WAIT, NULL); + LogFlow(("vboxNetFltSendDummy: a dummy packet has been successfully sent in order to prevent stuck-in-dock issue\n")); + } + else + LogFlow(("vboxNetFltSendDummy: unable to send dummy packet in order to prevent stuck-in-dock issue\n")); +} + /** * Internal worker for vboxNetFltOsInitInstance and vboxNetFltOsMaybeRediscovered. @@ -917,4 +956,7 @@ ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, pIfNet); RTSpinlockReleaseNoInts(pThis->hSpinlock); + + /* Prevent stuck-in-dock issue by associating interface receive thread with kernel thread */ + vboxNetFltSendDummy(pIfNet); /* @@ -983,15 +1025,4 @@ -/** - * Attempt to detect if a cable is attached to a network card. - * There is no direct way to detect this at any time. We assume - * if interface's baud rate is not zero then cable is attached. - */ -static int vboxNetFltCableAttached(ifnet_t pIfNet) -{ - return (ifnet_baudrate(pIfNet) != 0); -} - - int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst) { @@ -1002,13 +1033,4 @@ if (pIfNet) { - /* - * Do not send any data to a network stack if cable is not attached - * to a network card device in order to prevent stuck-in-dock problem. */ - if (!vboxNetFltCableAttached(pIfNet)) - { - vboxNetFltDarwinReleaseIfNet(pThis, pIfNet); - return rc; - } - /* * Create a mbuf for the gather list and push it onto the wire.