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

Timestamp:

Nov 14, 2008 8:28:11 AM (16 years ago)

Author:

vboxsync

Message:

moving slirp_link_* in NAT thread (review required)

File:

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

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

@@ -81 +81 @@
     /*used for wakep of poling thread*/
     RTSEMEVENT              semSndMutex;
+    RTSEMEVENT              semLinkMutex;
 #ifndef RT_OS_WINDOWS
     /** The write end of the control pipe. */
@@ -194 +195 @@
         case PDMNETWORKLINKSTATE_UP:
             LogRel(("NAT: link up\n"));
+#ifndef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
             slirp_link_up(pThis->pNATState);
-#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+#else
 # ifndef RT_OS_WINDOWS
             rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
@@ -208 +210 @@
         case PDMNETWORKLINKSTATE_DOWN_RESUME:
             LogRel(("NAT: link down\n"));
+#ifndef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
             slirp_link_down(pThis->pNATState);
-#ifdef VBOX_WITH_SIMPLEFIED_SLIRP_SYNC
+#else
 # ifndef RT_OS_WINDOWS
             rc = RTFileWrite(pThis->PipeWrite, "2", 2, NULL);
@@ -215 +218 @@
 # else
             WSASetEvent(pThis->hNetEvent); 
+            RTSemEventWait(pThis->semLinkMutex, RT_INDEFINITE_WAIT);
 # endif
 #endif
@@ -350 +354 @@
         }
         if ((event - WSA_WAIT_EVENT_0) == VBOX_NET_EVENT_INDEX) {
-                WSAResetEvent(pThis->hNetEvent);
-                break;
-        }
+                switch(pThis->enmLinkState) {
+                    case PDMNETWORKLINKSTATE_UP:
+                        slirp_link_up(pThis->pNATState);
+                    break;
+                    case PDMNETWORKLINKSTATE_DOWN:
+                    case PDMNETWORKLINKSTATE_DOWN_RESUME:
+                        slirp_link_down(pThis->pNATState);
+                    break;
+                }
+                WSAResetEvent(pThis->hNetEvent);
+                RTSemEventSignal(pThis->semLinkMutex);
+                break;
+        }
 # endif /* RT_OS_WINDOWS */
     }
@@ -476 +490 @@
     RTCritSectDelete(&pThis->CritSect);
 #else
+    RTSemEventDestroy(pThis->semLinkMutex);
     RTSemEventDestroy(pThis->semSndMutex);
 #endif
@@ -709 +724 @@
             pDrvIns->pDrvHlp->pfnPDMPollerRegister(pDrvIns, drvNATPoller);
 #else
+            rc = RTSemEventCreate(&pThis->semLinkMutex);
+            AssertReleaseRC(rc);
             rc = RTSemEventCreate(&pThis->semSndMutex);
             AssertReleaseRC(rc);
@@ -728 +745 @@
             pThis->hSendEvent = WSACreateEvent();
             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);
+            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