Changeset 14189 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 13, 2008 5:13:12 PM (16 years ago)

Author:

vboxsync

Message:

NAT: better error handling

File:

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

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

@@ -121 +121 @@
     int rc;
     /*notify select to wakeup*/
-    memcpy(pThis->cBuffer,pvBuf, cb);
+    AssertRelease(cb <= sizeof(pThis->cBuffer));
+    memcpy(pThis->cBuffer, pvBuf, cb);
     pThis->sBufferSize = cb;
 # ifndef RT_OS_WINDOWS
@@ -180 +181 @@
     LogFlow(("drvNATNotifyLinkChanged: enmLinkState=%d\n", enmLinkState));
 
+    LogRel(("drvNATNotifyLinkChanged\n"));
 #ifndef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
     int rc = RTCritSectEnter(&pThis->CritSect);
@@ -244 +246 @@
     fd_set  XcptFDs;
     int     nFDs = -1;
-    int     rc;
 # ifdef RT_OS_WINDOWS
     DWORD   event;
@@ -256 +257 @@
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
         return VINF_SUCCESS;
+
+#ifdef RT_OS_WINDOWS
+    phEvents = slirp_get_events(pThis->pNATState);
+#endif
 
     /*
@@ -302 +307 @@
         }
 # else /* RT_OS_WINDOWS */
-        phEvents = slirp_get_events(pThis->pNATState);
         event = WSAWaitForMultipleEvents(nFDs, phEvents, FALSE, 2 /*ms*/, FALSE);
-        AssertRelease(event != WSA_WAIT_FAILED);
-
-        if (event == WSA_WAIT_TIMEOUT) {
+        if (   (event < WSA_WAIT_EVENT_0 || event > WSA_WAIT_EVENT_0 + nFDs - 1)
+            && event != WSA_WAIT_TIMEOUT)
+        {
+            int error = WSAGetLastError();
+            LogRel(("WSAWaitForMultipleEvents returned %d (error %d)\n", event, error));
+            RTAssertReleasePanic();
+        }
+
+        if (event == WSA_WAIT_TIMEOUT)
+        {
             slirp_select_poll(pThis->pNATState, NULL, NULL, NULL);
-            continue;
-        }
+            continue;
+        }
 
         /*
          * see WSAWaitForMultipleEvents documentation: return value is a minimal index in array
          */
-        if ((event - WSA_WAIT_EVENT_0) > 0) {
+        if ((event - WSA_WAIT_EVENT_0) > 0)
             slirp_select_poll(pThis->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
-        }
 
         if ((event - WSA_WAIT_EVENT_0) == 0)
@@ -696 +706 @@
 # else
             pThis->hSendEvent = WSACreateEvent();
-            slirp_register_external_event(pThis->pNATState, pThis->hSendEvent);
+            slirp_register_external_event(pThis->pNATState, pThis->hSendEvent);
 # endif