Changeset 54741 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Mar 13, 2015 8:10:31 AM (10 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP/VBoxNetNAT: don't execute shutdown() twice

File:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp (modified) (1 diff)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -461 +461 @@
 {
     syncEnter();
-    m->fShutdown = true;
-    if (m->m_hThrRecv != NIL_RTTHREAD)
-    {
-        int rc = abortWait();
-        AssertRC(rc == VINF_SUCCESS || rc == VERR_SEM_DESTROYED);
-        rc = m->m_EventQ->interruptEventQueueProcessing();
-        if (RT_SUCCESS(rc))
+    if (!m->fShutdown)
+    {
+        m->fShutdown = true;
+        if (m->m_hThrRecv != NIL_RTTHREAD)
         {
-            rc = RTThreadWait(m->m_hThrRecv, 60000, NULL);
-            if (RT_FAILURE(rc))
-                LogWarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->m_hThrRecv, rc));
-        }
-        else
-        {
-            AssertMsgFailed(("interruptEventQueueProcessing() failed\n"));
-            RTThreadWait(m->m_hThrRecv , 0, NULL);
+            int rc = abortWait();
+            AssertRC(rc == VINF_SUCCESS || rc == VERR_SEM_DESTROYED);
+            rc = m->m_EventQ->interruptEventQueueProcessing();
+            if (RT_SUCCESS(rc))
+            {
+                rc = RTThreadWait(m->m_hThrRecv, 60000, NULL);
+                if (RT_FAILURE(rc))
+                    LogWarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->m_hThrRecv, rc));
+            }
+            else
+            {
+                AssertMsgFailed(("interruptEventQueueProcessing() failed\n"));
+                RTThreadWait(m->m_hThrRecv , 0, NULL);
+            }
         }
     }