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

Timestamp:

Nov 13, 2008 10:18:02 AM (16 years ago)

Author:

vboxsync

Message:

removing statics from slirp and using global pData instead

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (1 diff)
• slirp_state.h (modified) (1 diff)
• socket.c (modified) (1 diff)

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

@@ -226 +226 @@
     }
 #ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
-    /*XXX:probably should be configurable*/
     pData->cMaxEvent = WSA_MAXIMUM_WAIT_EVENTS;
+    pData->iCurrentEventIndex = 1; /* 0 - reserved for Sent event*/
+    pData->iCurrentSocketIndex = 0;
     pData->phEvents = malloc(sizeof(HANDLE) * pData->cMaxEvent);
     for (i = 1; i < WSA_MAXIMUM_WAIT_EVENTS; ++i) {

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -119 +119 @@
     int cMaxEvent;
     HANDLE *phEvents;
+    int iCurrentSocketIndex;
+    int iCurrentEventIndex;
 #endif
 } NATState;

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

@@ -739 +739 @@
 void soregister_event(struct NATState *pData, struct socket *so)
 {
-        static int soidx;
-        static int eidx = 1;
         
-        if (soidx >= WSA_MAXIMUM_WAIT_EVENTS * eidx) {
-                eidx++;
-        }
-        so->hNetworkEvent = pData->phEvents[eidx];
-        soidx++;
-}
-#endif
+        if (pData->iCurrentSocketIndex >= WSA_MAXIMUM_WAIT_EVENTS * pData->iCurrentEventIndex) {
+                pData->iCurrentEventIndex++;
+        }
+        so->hNetworkEvent = pData->phEvents[pData->iCurrentEventIndex];
+        pData->iCurrentSocketIndex++;
+}
+#endif