Changeset 14330 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2008 10:01:14 PM (16 years ago)

Author:

vboxsync

Message:

use slirp_get_timeout_ms() to skip the timeout if possible

File:

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

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

@@ -311 +311 @@
     fd_set  XcptFDs;
     int     nFDs = -1;
+    unsigned int ms;
 # ifdef RT_OS_WINDOWS
     DWORD   event;
@@ -339 +340 @@
          */
         slirp_select_fill(pThis->pNATState, &nFDs, &ReadFDs, &WriteFDs, &XcptFDs);
+        ms = slirp_get_timeout_ms(pThis->pNATState);
 # ifndef RT_OS_WINDOWS
-        struct timeval tv = { 0, 2000 }; /* 2ms */
+        struct timeval tv = { 0, ms*1000 };
         FD_SET(pThis->PipeRead, &ReadFDs);
         nFDs = ((int)pThis->PipeRead < nFDs ? nFDs : pThis->PipeRead);
-        int cChangedFDs = select(nFDs + 1, &ReadFDs, &WriteFDs, &XcptFDs, &tv);
+        int cChangedFDs = select(nFDs + 1, &ReadFDs, &WriteFDs, &XcptFDs, ms ? &tv : NULL);
         if (cChangedFDs >= 0)
         {
@@ -358 +360 @@
         }
 # else /* RT_OS_WINDOWS */
-        event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, 2 /*ms*/, FALSE);
+        event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, ms ? ms : WSA_INFINITE, FALSE);
         if (   (event < WSA_WAIT_EVENT_0 || event > WSA_WAIT_EVENT_0 + nFDs - 1)
             && event != WSA_WAIT_TIMEOUT)