Changeset 87949 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Mar 4, 2021 12:49:43 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143044

Message:

NAT/Net: Refuse to modify NATNetwork when an instance of it is
running. Use existing infrastructure that keeps track of the number
of VMs that use any given natnet (though it's exposes to natnet in a
somewhat haphazard way). bugref:9909.

Location:

trunk/src/VBox/Main/src-server

Files:

• NATNetworkImpl.cpp (modified) (8 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -149 +149 @@
 
 
+HRESULT NATNetwork::setErrorBusy()
+{
+    return setError(E_FAIL,
+               "Unable to change settings"
+               " while NATNetwork instance is running");
+}
+
+
 HRESULT NATNetwork::i_loadSettings(const settings::NATNetwork &data)
 {
@@ -212 +220 @@
         return setError(E_INVALIDARG,
                         tr("Network name cannot be empty"));
-    {
+
+    {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
+        /** @todo r=uwe who ensures there's no other network with that name? */
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
         if (aNetworkName == m->s.strNetworkName)
@@ -219 +234 @@
         m->s.strNetworkName = aNetworkName;
     }
+
+
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
     HRESULT rc = m->pVirtualBox->i_saveSettings();
@@ -296 +313 @@
 
     {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -377 +398 @@
 {
     {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -440 +465 @@
 
     {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -475 +504 @@
 {
     {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -612 +645 @@
 {
     {
+        AutoReadLock alockNatNetList(m->pVirtualBox->i_getNatNetLock() COMMA_LOCKVAL_SRC_POS);
+        if (m->pVirtualBox->i_isNatNetStarted(m->s.strNetworkName))
+            return setErrorBusy();
+
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 

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

@@ -3465 +3465 @@
 
 
+/*
+ * Export this to NATNetwork so that its setters can refuse to change
+ * essential network settings when an VBoxNatNet instance is running.
+ */
+RWLockHandle *VirtualBox::i_getNatNetLock() const
+{
+    return spMtxNatNetworkNameToRefCountLock;
+}
+
+
+/*
+ * Export this to NATNetwork so that its setters can refuse to change
+ * essential network settings when an VBoxNatNet instance is running.
+ * The caller is expected to hold a read lock on i_getNatNetLock().
+ */
+bool VirtualBox::i_isNatNetStarted(const Utf8Str &aNetworkName) const
+{
+    return sNatNetworkNameToRefCount[aNetworkName] > 0;
+}
+
+
 void VirtualBox::i_onCloudProviderListChanged(BOOL aRegistered)
 {