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

Timestamp:

Nov 14, 2008 5:10:28 AM (16 years ago)

Author:

vboxsync

Message:

introduced new event for handling link state changings (need some testing)

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (7 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (1 diff)
• slirp/slirp_state.h (modified) (1 diff)

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

@@ -89 +89 @@
     /*for send event from guest*/
     HANDLE                  hSendEvent;
+    HANDLE                  hNetEvent;
 #endif
     /** Send buffer */
@@ -193 +194 @@
             LogRel(("NAT: link up\n"));
             slirp_link_up(pThis->pNATState);
+#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+# ifndef RT_OS_WINDOWS
+            int rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
+            AssertRC(rc);
+# else
+            WSASetEvent(pThis->hNetEvent); 
+# endif
+#endif
             break;
 
@@ -199 +208 @@
             LogRel(("NAT: link down\n"));
             slirp_link_down(pThis->pNATState);
+#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+# ifndef RT_OS_WINDOWS
+            int rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
+            AssertRC(rc);
+# else
+            WSASetEvent(pThis->hNetEvent); 
+# endif
+#endif
             break;
 
@@ -325 +342 @@
          * see WSAWaitForMultipleEvents documentation: return value is a minimal index in array
          */
-        if ((event - WSA_WAIT_EVENT_0) > 0)
+        if ((event - WSA_WAIT_EVENT_0) >= VBOX_SEND_EVENT_INDEX) {
             slirp_select_poll(pThis->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
 
-        if ((event - WSA_WAIT_EVENT_0) == 0)
+        if ((event - WSA_WAIT_EVENT_0) == VBOX_SEND_EVENT_INDEX)
         {
             /** XXX distinguish between drvNATSend and wakeup only */
@@ -335 +352 @@
             RTSemEventSignal(pThis->semSndMutex);
         }
+        if ((event - WSA_WAIT_EVENT_0) == VBOX_NET_EVENT_INDEX) {
+                WSAResetEvent(pThis->hNetEvent);
+                break;
+        }
 # endif /* RT_OS_WINDOWS */
     }
@@ -355 +376 @@
     int rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
     AssertRC(rc);
+# else
+   WSASetEvent(pThis->hNetEvent); 
+# endif
     RTSemEventSignal(pThis->semSndMutex);
-#endif
     return VINF_SUCCESS;
 }
@@ -706 +729 @@
 # else
             pThis->hSendEvent = WSACreateEvent();
-            slirp_register_external_event(pThis->pNATState, pThis->hSendEvent);
+            pThis->hNetEvent = WSACreateEvent();
+            slirp_register_external_event(pThis->pNATState, pThis->hSendEvent, VBOX_SEND_EVENT_INDEX);
+            slirp_register_external_event(pThis->pNATState, pThis->hNetEvent, VBOX_NET_EVENT_INDEX);
 # endif
 

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

@@ -50 +50 @@
 
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
+#define VBOX_NET_EVENT_INDEX 0
+#define VBOX_SEND_EVENT_INDEX 1
+#define VBOX_SOCKET_EVENT_INDEX 2
 HANDLE *slirp_get_events(PNATState pData);
-void slirp_register_external_event(PNATState pData, HANDLE hEvent);
+void slirp_register_external_event(PNATState pData, HANDLE hEvent, int index);
 #endif
 #ifdef __cplusplus

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

@@ -935 +935 @@
         return pData->phEvents;
 }
-void slirp_register_external_event(PNATState pData, HANDLE hEvent)
-{
-        pData->phEvents[VBOX_SEND_EVENT_INDEX] = hEvent;
-}
-#endif
+void slirp_register_external_event(PNATState pData, HANDLE hEvent, int index)
+{
+        pData->phEvents[index] = hEvent;
+}
+#endif

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

@@ -117 +117 @@
     struct socket *udp_last_so;
 #if defined(VBOX_WITH_SIMPLEFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
-#define VBOX_SEND_EVENT_INDEX 0
-#define VBOX_SOCKET_EVENT_INDEX 1
 #define VBOX_SOCKET_EVENT (pData->phEvents[VBOX_SOCKET_EVENT_INDEX])
-#define VBOX_EVENT_COUNT 2
+#define VBOX_EVENT_COUNT 3
     HANDLE phEvents[VBOX_EVENT_COUNT];
 #endif