Changeset 14085 in vbox

Timestamp:

Nov 11, 2008 11:46:20 AM (16 years ago)

Author:

vboxsync

Message:

loops for initialization/creation of event array was fixed but wasn't removed
event per socket initialization was fixed
UDP event range for WSASelect was increased (UDB works ) testted with DNS
similar thing should be done for TCP (in progress)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (3 diffs)
• socket.c (modified) (1 diff)

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

@@ -374 +374 @@
                  */
                 cElements = 1;
-                for (so = tcb.so_next; so != &tcb; so = so_next, cElements++)
-                    ;
+                for (so = tcb.so_next; so != &tcb; so = so_next, cElements++) 
+                        so_next = so->so_next;
                 for (so = udb.so_next; so != &udb; so = so_next, cElements++)
-                    ;
+                        so_next = so->so_next;
                 if (pData->phEvents != NULL)
                     free(pData->phEvents);
@@ -497 +497 @@
                                 UPD_NFDS(so->s);
 #else
-                                rc = WSAEventSelect(so->s, so->hNetworkEvent, FD_READ);
+                                WSAResetEvent(so->hNetworkEvent);
+                                rc = WSAEventSelect(so->s, so->hNetworkEvent, FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT);
                                 AssertRelease(rc != SOCKET_ERROR);
                                 pData->phEvents[cEvents] = so->hNetworkEvent;
@@ -582 +583 @@
                 for (so = tcb.so_next; so != &tcb; so = so_next) {
                         so_next = so->so_next;
+
+                        /*
+                         * FD_ISSET is meaningless on these sockets
+                         * (and they can crash the program)
+                         */
+                        if (so->so_state & SS_NOFDREF || so->s == -1)
+                           continue;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
                         rc = WSAEnumNetworkEvents(so->s, so->hNetworkEvent, &NetworkEvents);    
                         AssertRelease(rc != SOCKET_ERROR);
 #endif
-
-                        /*
-                         * FD_ISSET is meaningless on these sockets
-                         * (and they can crash the program)
-                         */
-                        if (so->so_state & SS_NOFDREF || so->s == -1)
-                           continue;
 
                         /*

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

@@ -61 +61 @@
     so->s = -1;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
-    WSACreateEvent(so->hNetworkEvent); /*XXX: NOT correct place*/
+    so->hNetworkEvent = WSACreateEvent(); /*XXX: NOT correct place*/
+    AssertRelease(so->hNetworkEvent != WSA_INVALID_EVENT);
 #endif
   }