Changeset 14188 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

NAT: better error handling

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (13 diffs)

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

@@ -200 +200 @@
 {
     int fNATfailed = 0;
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-    int i;
-#endif
     PNATState pData = malloc(sizeof(NATState));
     *ppData = pData;
@@ -225 +222 @@
         WSAStartup(MAKEWORD(2,0), &Data);
     }
-#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
         pData->phEvents[VBOX_SOCKET_EVENT_INDEX] = CreateEvent(NULL, FALSE, FALSE, NULL);
 #endif
@@ -358 +355 @@
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
     int rc;
-    /* Number of valid entries.
-     * 1st event for drvNATSend() */
-    int cElements;
+    int error;
 #endif
 
@@ -376 +371 @@
                                ((struct ipasfrag *)&ipq != u32_to_ptr(pData, ipq.next, struct ipasfrag *)));
 
-#if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                /*
-                 * Make this array static with a fixed maximum
-                 * 1st event for drvNATSend()
-                 */
-                cElements = 1;
-#endif
-
                 for (so = tcb.so_next; so != &tcb; so = so_next) {
                         so_next = so->so_next;
@@ -409 +396 @@
 #else
                                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_READ|FD_WRITE|FD_ACCEPT|FD_CONNECT|FD_OOB);
-                                AssertRelease(rc != SOCKET_ERROR);
+                                if (rc == SOCKET_ERROR)
+                                {
+socket_error:
+                                    error = WSAGetLastError();
+                                    LogRel(("WSAEventSelector error %d (so=%x, socket=%s, event=%x)\n", error, so, so->s, VBOX_SOCKET_EVENT));
+                                }
 #endif
                                 continue;
@@ -423 +415 @@
 #else
                                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_READ|FD_WRITE|FD_ACCEPT|FD_CONNECT|FD_OOB);
-                                AssertRelease(rc != SOCKET_ERROR);
+                                if (rc == SOCKET_ERROR)
+                                    goto socket_error;
 #endif
                                 continue;
@@ -438 +431 @@
 #else
                                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_READ|FD_WRITE|FD_ACCEPT|FD_CONNECT|FD_OOB);
-                                AssertRelease(rc != SOCKET_ERROR);
+                                if (rc == SOCKET_ERROR)
+                                    goto socket_error;
                                 continue; /*XXX: we're using the widest mask for event*/
 #endif
@@ -454 +448 @@
 #else
                                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_OOB|FD_READ|FD_WRITE|FD_ACCEPT|FD_CONNECT);
-                                AssertRelease(rc != SOCKET_ERROR);
+                                if (rc == SOCKET_ERROR)
+                                    goto socket_error;
                                 continue; /*XXX: we're using the widest mask for event*/
 #endif
                         }
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                        WSAEventSelect(so->s, NULL, 0);
+                        rc = WSAEventSelect(so->s, NULL, 0);
+                        if (rc == SOCKET_ERROR)
+                            goto socket_error;
 #endif
                 }
@@ -496 +493 @@
 #else
                                 rc = WSAEventSelect(so->s, VBOX_SOCKET_EVENT, FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT);
-                                AssertRelease(rc != SOCKET_ERROR);
+                                if (rc == SOCKET_ERROR)
+                                    goto socket_error;
                                 continue;
 #endif
                         }
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-                        WSAEventSelect(so->s, NULL, 0);
+                        else
+                        {
+                            rc = WSAEventSelect(so->s, NULL, 0);
+                            if (rc != SOCKET_ERROR)
+                                goto socket_error;
+                        }
 #endif
                 }
@@ -551 +554 @@
     int ret;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-        WSANETWORKEVENTS NetworkEvents;                 
+        WSANETWORKEVENTS NetworkEvents;
         int rc;
+        int error;
         int timer_update = (readfds == NULL && writefds == NULL && xfds == NULL);
 #endif
@@ -595 +599 @@
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
                         rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);    
-                        AssertRelease(rc != SOCKET_ERROR);
+                        if (rc == SOCKET_ERROR)
+                        {
+                            error = WSAGetLastError();
+                            LogRel(("WSAEnumNetworkEvents TCP error %d\n", error));
+                            continue;
+                        }
 #endif
 
@@ -730 +739 @@
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
                         rc = WSAEnumNetworkEvents(so->s, VBOX_SOCKET_EVENT, &NetworkEvents);    
-                        AssertRelease(rc != SOCKET_ERROR);
+                        if (rc == SOCKET_ERROR)
+                        {
+                            error = WSAGetLastError();
+                            LogRel(("WSAEnumNetworkEvents TCP error %d\n", error));
+                            continue;
+                        }
 #endif
 #if !defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) || !defined(RT_OS_WINDOWS)
@@ -919 +933 @@
 HANDLE *slirp_get_events(PNATState pData)
 {
-        return (pData->phEvents);
+        return pData->phEvents;
 }
 void slirp_register_external_event(PNATState pData, HANDLE hEvent)