Changeset 22192 in vbox for trunk/src/VBox/Devices/Network/DrvNAT.cpp

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

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (3 diffs)

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
+}
 
 /**