Changeset 22599 in vbox

Timestamp:

Aug 31, 2009 12:10:12 PM (15 years ago)

Author:

vboxsync

Message:

netflt-adp/win: additional bugfix

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• win/VBoxNetFlt-win.h (modified) (1 diff)
• win/VBoxNetFltCommon-win.h (modified) (3 diffs)
• win/VBoxNetFltPt-win.c (modified) (3 diffs)

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

@@ -195 +195 @@
             /** Filter driver device context. */
             ADAPT IfAdaptor;
-            /** since the driver is able to work in different modes (NetFlt or PassThru)
-             * we need to wait for the old-mode operations to complete before switching to the new mode
-             * The most trickiest here is NetFlt->PassThru switch as we can not block in PtSent/Receive
-             * because they typically run at DPC level
-             * we also not allowed to re-order packets, so on NetFlt-PassThru switch (kVBoxNetDevMode_NetFltDeinitializing mode)
-             * we put them to the pending queue to process them in order on final mode activation stage */
-            volatile VBOXNETDEVMODE_TYPE enmModeMP;
-            volatile VBOXNETDEVMODE_TYPE enmModePT;
+
             volatile uint32_t cModeNetFltRefs;
             volatile uint32_t cModePassThruRefs;

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.h

@@ -232 +232 @@
     pList->pTail->Next = pEntry;
     pList->pTail = pEntry;
+    pEntry->Next = NULL;
 }
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltCommon-win.h

@@ -297 +297 @@
 /*    NDIS_HANDLE                    hHandle; */
 } ADAPT_DEVICE, *PADAPT_DEVICE;
-
-
-typedef enum VBOXNETDEVMODE_TYPE
-{
-    kVBoxNetDevMode_InvalidValue = 0,
-    kVBoxNetDevMode_NetFltInitializing,
-    kVBoxNetDevMode_NetFltInitialized,
-    kVBoxNetDevMode_NetFltDeinitializing,
-    kVBoxNetDevMode_NetFltWaitDeinitialized,
-    kVBoxNetDevMode_NetFltDeinitialized,
-
-} VBOXNETDEVMODE_TYPE;
 
 /* packet filter processing mode constants */
@@ -481 +469 @@
 } TRANSFERDATA_RSVD, *PTRANSFERDATA_RSVD;
 
-typedef struct _PT_RSVD
-{
-    union
-    {
-        SEND_RSVD SendRsvd;
-        TRANSFERDATA_RSVD TransferDataRsvd;
-    };
-} PT_RSVD, *PPT_RSVD;
-
-
-#ifndef VBOX_NETFLT_ONDEMAND_BIND
 /** Miniport reserved part of a received packet that is allocated by
  * us. Note that this should fit into the MiniportReserved space
@@ -505 +482 @@
 } RECV_RSVD, *PRECV_RSVD;
 
+typedef struct _PT_RSVD
+{
+    union
+    {
+        RECV_RSVD RecvRsvd;
+        TRANSFERDATA_RSVD TransferDataRsvd;
+    } u;
+} PT_RSVD, *PPT_RSVD;
+
+
+#ifndef VBOX_NETFLT_ONDEMAND_BIND
+
 C_ASSERT(sizeof(RECV_RSVD) <= sizeof(((PNDIS_PACKET)0)->MiniportReserved));
 #endif

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -799 +799 @@
 static bool vboxNetFltWinRemovePacketFromList(PINTERLOCKED_SINGLE_LIST pList, PNDIS_PACKET pPacket)
 {
-    PTRANSFERDATA_RSVD pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->TransferDataRsvd;
+    PTRANSFERDATA_RSVD pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->u.TransferDataRsvd;
     return vboxNetFltWinInterlockedSearchListEntry(pList, &pTDR->ListEntry,
             true /* remove*/);
@@ -809 +809 @@
 static void vboxNetFltWinPutPacketToList(PINTERLOCKED_SINGLE_LIST pList, PNDIS_PACKET pPacket, PNDIS_BUFFER pOrigBuffer)
 {
-    PTRANSFERDATA_RSVD pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->TransferDataRsvd;
+    PTRANSFERDATA_RSVD pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->u.TransferDataRsvd;
     pTDR->pOriginalBuffer = pOrigBuffer;
     vboxNetFltWinInterlockedPutTail(pList, &pTDR->ListEntry);
@@ -827 +827 @@
         return false;
 
-    pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->TransferDataRsvd;
+    pTDR = &((PPT_RSVD)pPacket->ProtocolReserved)->u.TransferDataRsvd;
     Assert(pTDR);
     Assert(pTDR->pOriginalBuffer);