Changeset 54671 in vbox for trunk/src/VBox

Timestamp:

Mar 6, 2015 4:55:29 PM (10 years ago)

Author:

vboxsync

Message:

NAT networks: don't kill VBoxNetDHCP and VBoxNetNAT but send the INATNetworkStartStop event to ask them politely to shutdown

Location:

trunk/src/VBox

Files:

• Main/src-server/NetworkServiceRunner.cpp (modified) (1 diff)
• NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)
• NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/NetworkServiceRunner.cpp

@@ -117 +117 @@
         return VINF_OBJECT_DESTROYED;
 
-    int rc = RTProcTerminate(m->mProcess);
-    RTProcWait(m->mProcess, RTPROCWAIT_FLAGS_BLOCK, NULL);
     m->mProcess = NIL_RTPROCESS;
-    return rc;
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -519 +519 @@
     ComEventTypeArray aVBoxEvents;
     aVBoxEvents.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
+    aVBoxEvents.push_back(VBoxEventType_OnNATNetworkStartStop);
     rc = createNatListener(m_vboxListener, virtualbox, this, aVBoxEvents);
     AssertRCReturn(rc, rc);
@@ -596 +597 @@
             fetchAndUpdateDnsInfo();
             break;
+
+        case VBoxEventType_OnNATNetworkStartStop:
+        {
+            ComPtr <INATNetworkStartStopEvent> pStartStopEvent = pEvent;
+            BOOL fStart = TRUE;
+            HRESULT hrc = pStartStopEvent->COMGETTER(StartEvent)(&fStart);
+            if (!fStart)
+                shutdown();
+            break;
+        }
     }
 

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -389 +389 @@
             break;
         }
+
+        case VBoxEventType_OnNATNetworkStartStop:
+        {
+            ComPtr <INATNetworkStartStopEvent> pStartStopEvent = pEvent;
+            BOOL fStart = TRUE;
+            hrc = pStartStopEvent->COMGETTER(StartEvent)(&fStart);
+            if (!fStart)
+                shutdown();
+            break;
+        }
     }
     return hrc;
@@ -784 +794 @@
     ComEventTypeArray aVBoxEvents;
     aVBoxEvents.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
+    aVBoxEvents.push_back(VBoxEventType_OnNATNetworkStartStop);
     rc = createNatListener(m_vboxListener, virtualbox, this, aVBoxEvents);
     AssertRCReturn(rc, rc);