Changeset 49127 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 16, 2013 10:18:34 AM (11 years ago)

Author:

vboxsync

Message:

Main/NATNetworkImpl.cpp: do settings saving and event firing iff new value differs from old one.

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (8 diffs)

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

@@ -296 +296 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+    if (aName == mName)
+        return S_OK;
+
     unconst(mName) = aName;
 
@@ -327 +331 @@
     HRESULT rc = S_OK;
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+    if (aEnabled == m->fEnabled)
+        return S_OK;
+
     m->fEnabled = aEnabled;
 
@@ -368 +376 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+    if (aIPv4NetworkCidr == m->IPv4NetworkCidr)
+        return S_OK;
+        
     /* silently ignore network cidr update */
     if (m->mapName2PortForwardRule4.empty())
@@ -401 +413 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aIPv6Enabled == m->fIPv6Enabled)
+        return S_OK;
+
     m->fIPv6Enabled = aIPv6Enabled;
 
@@ -436 +452 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    if (aIPv6Prefix == m->IPv6Prefix)
+        return S_OK;
+
     /* silently ignore network cidr update */
     if (m->mapName2PortForwardRule6.empty())
@@ -469 +488 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+    if (aAdvertiseDefaultIPv6Route == m->fAdvertiseDefaultIPv6Route)
+        return S_OK;
+
     m->fAdvertiseDefaultIPv6Route = aAdvertiseDefaultIPv6Route;
 
@@ -499 +522 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+    if (aNeedDhcpServer == m->fNeedDhcpServer)
+        return S_OK;
+
     m->fNeedDhcpServer = aNeedDhcpServer;
 
@@ -628 +655 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+    if (aLoopbackIp6 < 0)
+        return E_INVALIDARG;
+
+    if (static_cast<uint32_t>(aLoopbackIp6) == m->u32LoopbackIp6)
+        return S_OK;
+    
     m->u32LoopbackIp6 = aLoopbackIp6;