Changeset 52394 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Aug 15, 2014 10:25:31 PM (11 years ago)

Author:

vboxsync

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

95550

Message:

intnetR0TrunkIfPortDisconnect: Must always release the busy reference to the interface side (netflt) and must not trust pThis->pIfPort to be working as it's cleared before doing the busy waiting in intnetR0TrunkIfDestroy. So, pfnDisconnect has been extended with a pIfPort pointer as well as a function pointer to a busy-release function for pIfPort.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFlt.c (modified) (2 diffs)
• VBoxNetFltInternal.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c

@@ -749 +749 @@
 
 /**
- * @copydoc INTNETTRUNKIFPORT::pfnRetain
- */
-#ifdef VBOX_WITH_INTNET_DISCONNECT
-static DECLCALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort, bool fBusy)
-{
-    PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
-    vboxNetFltRelease(pThis, fBusy);
-}
-#else /* !VBOX_WITH_INTNET_DISCONNECT */
+ * @copydoc INTNETTRUNKIFPORT::pfnRelease
+ */
 static DECLCALLBACK(void) vboxNetFltPortRelease(PINTNETTRUNKIFPORT pIfPort)
 {
@@ -763 +756 @@
     vboxNetFltRelease(pThis, false /* fBusy */);
 }
-#endif /* !VBOX_WITH_INTNET_DISCONNECT */
+
+
+/**
+ * @callback_method_impl{FNINTNETTRUNKIFPORTRELEASEBUSY}
+ */
+DECLHIDDEN(DECLCALLBACK(void)) vboxNetFltPortReleaseBusy(PINTNETTRUNKIFPORT pIfPort)
+{
+    PVBOXNETFLTINS pThis = IFPORT_2_VBOXNETFLTINS(pIfPort);
+    vboxNetFltRelease(pThis, true /*fBusy*/);
+}
 
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -330 +330 @@
 DECLHIDDEN(PVBOXNETFLTINS) vboxNetFltFindInstance(PVBOXNETFLTGLOBALS pGlobals, const char *pszName);
 
+DECLHIDDEN(DECLCALLBACK(void)) vboxNetFltPortReleaseBusy(PINTNETTRUNKIFPORT pIfPort);
 DECLHIDDEN(void) vboxNetFltRetain(PVBOXNETFLTINS pThis, bool fBusy);
 DECLHIDDEN(bool) vboxNetFltTryRetainBusyActive(PVBOXNETFLTINS pThis);