Changeset 48710 in vbox for trunk

Timestamp:

Sep 26, 2013 1:44:36 PM (11 years ago)

Author:

vboxsync

Message:

NatNetworking/Main: do reference couting on network attachment switch.

Location:

trunk/src/VBox/Main

Files:

• include/NetworkAdapterImpl.h (modified) (1 diff)
• src-server/NetworkAdapterImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -155 +155 @@
     HRESULT updateMacAddress(Utf8Str aMacAddress);
     void updateBandwidthGroup(BandwidthGroup *aBwGroup);
+    HRESULT checkAndSwitchFromNatNetworking();
+    HRESULT switchToNatNetworking(IN_BSTR aNatNetworkName);
 
     Machine * const     mParent;

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

@@ -24 +24 @@
 #include "HostImpl.h"
 #include "SystemPropertiesImpl.h"
+#include "VirtualBoxImpl.h"
 
 #include <iprt/string.h>
@@ -542 +543 @@
         }
 
+        alock.release();
+
+        HRESULT hrc = checkAndSwitchFromNatNetworking();
+        if (FAILED(hrc))
+            return hrc;
+
+        alock.acquire();
+
         mData.backup();
         mData->mBridgedInterface = aBridgedInterface;
@@ -602 +611 @@
         }
 
+        alock.release();
+
+        HRESULT hrc = checkAndSwitchFromNatNetworking();
+        if (FAILED(hrc))
+            return hrc;
+
+        alock.acquire();
+
         mData.backup();
         mData->mHostOnlyInterface = aHostOnlyInterface;
@@ -658 +675 @@
         }
 
+        alock.release();
+
+        HRESULT hrc = checkAndSwitchFromNatNetworking();
+        if (FAILED(hrc))
+            return hrc;
+
+        alock.acquire();
+
         mData.backup();
         mData->mInternalNetwork = aInternalNetwork;
@@ -709 +734 @@
     if (mData->mNATNetwork != aNATNetwork)
     {
+
+        HRESULT hrc;
         /* if an empty/null string is to be set, host only interface must be
          * turned off */
@@ -719 +746 @@
 
         mData.backup();
+        
+        alock.release();
+
+        hrc = checkAndSwitchFromNatNetworking();
+        if (FAILED(hrc))
+            return hrc;
+
+        hrc = switchToNatNetworking(aNATNetwork);
+        if (FAILED(hrc))
+            return hrc;
+
+        alock.acquire();
+
         mData->mNATNetwork = aNATNetwork;
 
@@ -1550 +1590 @@
     LogFlowThisFuncLeave();
 }
+
+
+HRESULT NetworkAdapter::checkAndSwitchFromNatNetworking()
+{
+    HRESULT hrc;
+    MachineState_T state;
+
+    hrc = mParent->COMGETTER(State)(&state);
+    if (FAILED(hrc))
+        return hrc;
+
+    if (   mData->mAttachmentType == NetworkAttachmentType_NATNetwork
+        && state == MachineState_Running)
+    {
+        int natCount;
+
+        natCount = mParent->getVirtualBox()->natNetworkRefDec(mData->mNATNetwork.raw());
+        if (natCount == -1)
+            return E_INVALIDARG; /* no such network */
+    }
+    
+    return S_OK;
+}
+
+
+HRESULT NetworkAdapter::switchToNatNetworking(IN_BSTR aNatNetworkName)
+{
+    HRESULT hrc;
+    MachineState_T state;
+
+    hrc = mParent->COMGETTER(State)(&state);
+    if (FAILED(hrc))
+        return hrc;
+
+    if (state == MachineState_Running)
+    {
+        int natCount;
+
+        natCount = mParent->getVirtualBox()->natNetworkRefInc(aNatNetworkName);
+        if (natCount == -1)
+            return E_INVALIDARG; /* not found */
+    }
+
+    return S_OK;
+}
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */