Changeset 65760 in vbox

Timestamp:

Feb 13, 2017 11:32:20 AM (8 years ago)

Author:

vboxsync

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

113475

Message:

FE/Qt: Global properties: Network page: Host-only Networks tab: Don't save DHCP server attributes if it's disabled, they can be empty or wrong but that's not our business.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -1168 +1168 @@
     /* Save DHCP server configuration: */
     dhcp.SetEnabled(data.m_dhcpserver.m_fDhcpServerEnabled);
-    AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerAddress.toUtf8().constData()),
-              ("DHCP server IPv4 address must be IPv4-valid!\n"));
-    AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerMask.toUtf8().constData()),
-              ("DHCP server IPv4 network mask must be IPv4-valid!\n"));
-    AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpLowerAddress.toUtf8().constData()),
-              ("DHCP server IPv4 lower bound must be IPv4-valid!\n"));
-    AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpUpperAddress.toUtf8().constData()),
-              ("DHCP server IPv4 upper bound must be IPv4-valid!\n"));
-    if (RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerAddress.toUtf8().constData()) &&
-        RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerMask.toUtf8().constData()) &&
-        RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpLowerAddress.toUtf8().constData()) &&
-        RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpUpperAddress.toUtf8().constData()))
-    {
-        dhcp.SetConfiguration(data.m_dhcpserver.m_strDhcpServerAddress, data.m_dhcpserver.m_strDhcpServerMask,
-                              data.m_dhcpserver.m_strDhcpLowerAddress, data.m_dhcpserver.m_strDhcpUpperAddress);
-        if (!dhcp.isOk())
-            emit sigOperationProgressError(UIMessageCenter::formatErrorInfo(dhcp));
-    }
+    if (data.m_dhcpserver.m_fDhcpServerEnabled)
+    {
+        AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerAddress.toUtf8().constData()),
+                  ("DHCP server IPv4 address must be IPv4-valid!\n"));
+        AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerMask.toUtf8().constData()),
+                  ("DHCP server IPv4 network mask must be IPv4-valid!\n"));
+        AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpLowerAddress.toUtf8().constData()),
+                  ("DHCP server IPv4 lower bound must be IPv4-valid!\n"));
+        AssertMsg(RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpUpperAddress.toUtf8().constData()),
+                  ("DHCP server IPv4 upper bound must be IPv4-valid!\n"));
+        if (RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerAddress.toUtf8().constData()) &&
+            RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpServerMask.toUtf8().constData()) &&
+            RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpLowerAddress.toUtf8().constData()) &&
+            RTNetIsIPv4AddrStr(data.m_dhcpserver.m_strDhcpUpperAddress.toUtf8().constData()))
+            dhcp.SetConfiguration(data.m_dhcpserver.m_strDhcpServerAddress, data.m_dhcpserver.m_strDhcpServerMask,
+                                  data.m_dhcpserver.m_strDhcpLowerAddress, data.m_dhcpserver.m_strDhcpUpperAddress);
+    }
+    if (!dhcp.isOk())
+        emit sigOperationProgressError(UIMessageCenter::formatErrorInfo(dhcp));
 }