Changeset 67792 in vbox

Timestamp:

Jul 5, 2017 11:30:48 AM (8 years ago)

Author:

vboxsync

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

116711

Message:

Main/NetworkAdapterImpl: fixed another case with wrong NAT/DHCP refcounting: don't change the NAT refcount if the current networking mode is not 'NAT network'. This happens for instance if we change the adapter type from something else to 'NAT network' in the GUI and at the same time change the NAT network name.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -112 +112 @@
     HRESULT i_updateMacAddress(Utf8Str aMacAddress);
     void i_updateBandwidthGroup(BandwidthGroup *aBwGroup);
-    HRESULT i_checkAndSwitchFromNatNetworking(com::Utf8Str networkName);
+    HRESULT i_switchFromNatNetworking(const com::Utf8Str &aNatnetworkName);
     HRESULT i_switchToNatNetworking(const com::Utf8Str &aNatNetworkName);
 

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

@@ -458 +458 @@
 
         if (oldAttachmentType == NetworkAttachmentType_NATNetwork)
-            i_checkAndSwitchFromNatNetworking(mData->strNATNetworkName);
+            i_switchFromNatNetworking(mData->strNATNetworkName);
 
         if (aAttachmentType == NetworkAttachmentType_NATNetwork)
@@ -648 +648 @@
         mParent->i_setModified(Machine::IsModified_NetworkAdapters);
         mlock.release();
-        i_checkAndSwitchFromNatNetworking(oldNatNetworkName.raw());
-
-        i_switchToNatNetworking(aNATNetwork);
+
+        if (mData->mode == NetworkAttachmentType_NATNetwork)
+        {
+            i_switchFromNatNetworking(oldNatNetworkName.raw());
+            i_switchToNatNetworking(aNATNetwork);
+        }
+
         /* When changing the host adapter, adapt the CFGM logic to make this
          * change immediately effect and to notify the guest that the network
@@ -1389 +1393 @@
 
 
-HRESULT NetworkAdapter::i_checkAndSwitchFromNatNetworking(com::Utf8Str networkName)
+HRESULT NetworkAdapter::i_switchFromNatNetworking(const com::Utf8Str &networkName)
 {
     HRESULT hrc;