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

Timestamp:

Oct 30, 2009 8:24:36 PM (15 years ago)

Author:

vboxsync

Message:

netflt/win: fix Protocol/Miniport reserved field usage

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

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

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

@@ -2365 +2365 @@
                                    MIN_PACKET_POOL_SIZE,
                                    MAX_PACKET_POOL_SIZE - MIN_PACKET_POOL_SIZE,
-                                   sizeof(PT_RSVD));
+                                   sizeof(SEND_RSVD));
 
         if (Status != NDIS_STATUS_SUCCESS)

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

@@ -464 +464 @@
 
 /** obtains the PTRANSFERDATA_RSVD given a single list entry it contains */
-#define PT_SLE_2_TRANSFERDATA_RSVD(_pl) \
-    ( (PTRANSFERDATA_RSVD)((uint8_t *)(_pl) - RT_OFFSETOF(TRANSFERDATA_RSVD, ListEntry)))
-
-/** obtains the ndis packet given a single list entry assuming it is stored in ProtocolReserved field of the packet */
-#define PT_SLE_2_NDIS_PACKET(_pl) \
-   ( (PNDIS_PACKET)((uint8_t *)PT_SLE_2_TRANSFERDATA_RSVD(_pl) - RT_OFFSETOF(NDIS_PACKET, ProtocolReserved)))
+//#define PT_SLE_2_TRANSFERDATA_RSVD(_pl) \
+//    ( (PTRANSFERDATA_RSVD)((uint8_t *)(_pl) - RT_OFFSETOF(TRANSFERDATA_RSVD, ListEntry)))
+
+///** obtains the ndis packet given a single list entry assuming it is stored in ProtocolReserved field of the packet */
+//#define PT_SLE_2_NDIS_PACKET(_pl) \
+//   ( (PNDIS_PACKET)((uint8_t *)PT_SLE_2_TRANSFERDATA_RSVD(_pl) - RT_OFFSETOF(NDIS_PACKET, ProtocolReserved)))
 
 /**************************************************************************

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

@@ -471 +471 @@
 } 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));
+C_ASSERT(sizeof(TRANSFERDATA_RSVD) <= PROTOCOL_RESERVED_SIZE_IN_PACKET);
 #endif
 

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

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