Changeset 29592 in vbox

Timestamp:

May 18, 2010 7:22:57 AM (15 years ago)

Author:

vboxsync

Message:

netflt/win: fix loopback packets handling for no-packet-queue

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c (modified) (4 diffs)

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

@@ -446 +446 @@
     IN PADAPT             pAdapt,
     IN PNDIS_PACKET           pPacket
+#ifdef VBOXNETFLT_NO_PACKET_QUEUE
+    , bool bNetFltActive
+#endif
     )
 {
@@ -457 +460 @@
     {
 #if !defined(VBOX_LOOPBACK_USEFLAGS) /* || defined(DEBUG_NETFLT_PACKETS) */
+# ifdef VBOXNETFLT_NO_PACKET_QUEUE
+        if (bNetFltActive)
+            vboxNetFltWinLbPutSendPacket(pAdapt, pMyPacket, false /* bFromIntNet */);
+# else
         /* no need for the loop enqueue & check in a passthru mode , ndis will do everything for us */
+# endif
 #endif
         NdisSend(&fStatus,
@@ -466 +474 @@
 #ifndef WIN9X
             NdisIMCopySendCompletePerPacketInfo (pPacket, pMyPacket);
+#endif
+#if defined(VBOXNETFLT_NO_PACKET_QUEUE) && !defined(VBOX_LOOPBACK_USEFLAGS)
+        if (bNetFltActive)
+            vboxNetFltWinLbRemoveSendPacket(pAdapt, pMyPacket);
 #endif
             NdisFreePacket(pMyPacket);
@@ -838 +850 @@
             {
 #ifndef VBOXNETADP
-                fStatus = vboxNetFltWinSendPassThru(pAdapt, pPacket);
+                fStatus = vboxNetFltWinSendPassThru(pAdapt, pPacket
+#ifdef VBOXNETFLT_NO_PACKET_QUEUE
+                               , !!cNetFltRefs
+#endif
+                        );
 #else
                 if(!cNetFltRefs)