Changeset 14086 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 11, 2008 12:06:26 PM (16 years ago)

Author:

vboxsync

Message:

array of 2 events replaced with 1 because the event array is managed by slirp
fixed index selector, which triggered _poll part of slirp in case of slirp opened 2 and more sockets

File:

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

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

@@ -87 +87 @@
     RTFILE                  PipeRead;
 #else
-    /* 1 - for Outher network events, and 0 for sending routine notification*/
-    HANDLE                  hNetworkEvent[2];
+    /*for send event from guest*/
+    HANDLE                  hSendEvent;
 #endif
     /** Send buffer */
@@ -119 +119 @@
 #ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
 
+    int rc;
     /*notify select to wakeup*/
     memcpy(pThis->cBuffer,pvBuf, cb);
     pThis->sBufferSize = cb;
 # ifndef RT_OS_WINDOWS
-    int rc = RTFileWrite(pThis->PipeWrite, "1", 2, NULL);
+    rc = RTFileWrite(pThis->PipeWrite, "1", 2, NULL);
     AssertRC(rc);
 # else
-    WSASetEvent(pThis->hNetworkEvent[0]);
+    rc = WSASetEvent(pThis->hSendEvent);
+    AssertRelease(rc == TRUE);
 # endif
     RTSemEventWait(pThis->semSndMutex, RT_INDEFINITE_WAIT);
@@ -301 +303 @@
 # else /* RT_OS_WINDOWS */
         phEvents = slirp_get_events(pThis->pNATState);
-        phEvents[0] = pThis->hNetworkEvent[0];
+        phEvents[0] = pThis->hSendEvent;
         event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, 2 /*ms*/, FALSE);
         AssertRelease(event != WSA_WAIT_FAILED);
+
+        if (event == WSA_WAIT_TIMEOUT) {
+                continue;
+        }
 
         /*
          * see WSAWaitForMultipleEvents documentation: return value is a minimal index in array
          */
-        if ((event - WSA_WAIT_EVENT_0) > 1)
+        if ((event - WSA_WAIT_EVENT_0) > 0) {
             slirp_select_poll(pThis->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
+        }
 
         if ((event - WSA_WAIT_EVENT_0) == 0)
         {
             /** XXX distinguish between drvNATSend and wakeup only */
-            slirp_input(pThis->pNATState, (uint8_t *)pThis->cBuffer, pThis->sBufferSize);
-            WSAResetEvent(pThis->hNetworkEvent[0]);
+            slirp_input(pThis->pNATState, (uint8_t *)&pThis->cBuffer[0], pThis->sBufferSize);
+            WSAResetEvent(pThis->hSendEvent);
             RTSemEventSignal(pThis->semSndMutex);
         }
-        WSAResetEvent(pThis->hNetworkEvent[0]);
 # endif /* RT_OS_WINDOWS */
     }
@@ -689 +695 @@
             pThis->PipeWrite = fds[1];
 # else
-            pThis->hNetworkEvent[0] = WSACreateEvent();
-            pThis->hNetworkEvent[1] = WSACreateEvent();
+            pThis->hSendEvent = WSACreateEvent();
 # endif