Changeset 15893 in vbox for trunk/src/VBox

Timestamp:

Jan 12, 2009 2:11:29 PM (16 years ago)

Author:

vboxsync

Message:

INTNETR0IfWait fix, NetFlt/win fixes

Location:

trunk/src/VBox

Files:

• Devices/Network/SrvIntNetR0.cpp (modified) (1 diff)
• HostDrivers/VBoxNetFlt/VBoxNetFlt.c (modified) (1 diff)
• HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -3048 +3048 @@
         if (!pIf->fDestroying)
         {
-            if (!intnetR0IfRelease(pIf, pSession))
+            if (intnetR0IfRelease(pIf, pSession))
                 rc = VERR_SEM_DESTROYED;
         }

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

@@ -1025 +1025 @@
             break;
         case kVBoxNetFltInsState_Connected:
-            rc = VINF_SUCCESS;
+            Assert(0);
+            rc = VERR_INTNET_FLT_IF_BUSY;
             break;
         case kVBoxNetFltInsState_Disconnecting:

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

@@ -191 +191 @@
             /** @name Windows instance data.
              * @{ */
-//#  ifdef VBOX_NETFLT_ONDEMAND_BIND
             /** Filter driver device context. */
             ADAPT IfAdaptor;
-//#  else
-//            /** Pointer to the filter driver device context. */
-//            PADAPT volatile pIfAdaptor;
-//#  endif
+            /** Packet worker thread info */
+            PACKET_QUEUE_WORKER PacketQueueWorker;
             /** The MAC address of the interface. Caching MAC for performance reasons. */
             RTMAC Mac;