Changeset 22192 in vbox

Timestamp:

Aug 12, 2009 4:18:32 AM (15 years ago)

Author:

vboxsync

Message:

NAT: slirp_can_send (on NAT thread and EMT)
flushes PDM queue on flushing Slirp's one

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/if.c (modified) (1 diff)
• slirp/libslirp.h (modified) (1 diff)

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

@@ -61 +61 @@
  */
 #define VBOX_NAT_DELAY_HACK
+#if 0
+#define SLIRP_CAN_SAND_IN_PDM 1
+#define SLIRP_FLUSH_DEV 1
+#endif
 
 #define GET_EXTRADATA(pthis, node, name, rc, type, type_name, var)                                  \
@@ -537 +541 @@
 int slirp_can_output(void *pvUser)
 {
+#ifdef SLIRP_CAN_SAND_IN_PDM
     int status = 0;
     int rc = 0;
@@ -552 +557 @@
     }
     return 0;
-}
-
+#else
+   PDRVNAT pThis = (PDRVNAT)pvUser;
+   return (RT_SUCCESS(pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0))? 1 : 0);
+#endif
+}
+
+void slirp_flush_dev(void *pvUser)
+{
+#ifdef SLIRP_FLUSH_DEV
+    PDRVNAT pThis = (PDRVNAT)pvUser;
+    /*@todo: idealy should be done in other thread */
+    PDMQueueFlush(pThis->pSendQueue);
+#endif
+}
 
 /**

trunk/src/VBox/Devices/Network/slirp/if.c

@@ -226 +226 @@
         if_encap(pData, ETH_P_IP, ifm);
 
-        if (!if_queued)
+        if (!if_queued) 
+        {
+            slirp_flush_dev(pData->pvUser);
             return;
-    }
-}
+        }
+    }
+}

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -113 +113 @@
  */
 unsigned int slirp_get_timeout_ms(PNATState pData);
+void slirp_flush_dev(void *pvUser);
 
 # ifndef RT_OS_WINDOWS