Changeset 65603 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 3, 2017 3:54:38 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global properties: Network page: Host-only networks tab: Propose suitable pattern for DHCP server attributes which are empty or default (0.0.0.0).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsNetworkDetailsHost.cpp (modified) (2 diffs)
• UIGlobalSettingsNetworkDetailsHost.h (modified) (1 diff)

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

@@ -163 +163 @@
     if (fIsManual)
     {
+        /* Load values from COM wrappers: */
         m_pDhcpAddressEditor->setText(m_data.m_dhcpserver.m_strDhcpServerAddress);
         m_pDhcpMaskEditor->setText(m_data.m_dhcpserver.m_strDhcpServerMask);
         m_pDhcpLowerAddressEditor->setText(m_data.m_dhcpserver.m_strDhcpLowerAddress);
         m_pDhcpUpperAddressEditor->setText(m_data.m_dhcpserver.m_strDhcpUpperAddress);
+
+        /* Invent default values where necessary: */
+        const quint32 uAddr = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceAddress);
+        const quint32 uMask = ipv4FromQStringToQuint32(m_data.m_interface.m_strInterfaceMask);
+        const quint32 uProp = uAddr & uMask;
+        const QString strMask = ipv4FromQuint32ToQString(uMask);
+        const QString strProp = ipv4FromQuint32ToQString(uProp);
+        //printf("Proposal is = %s x %s\n",
+        //       strProp.toUtf8().constData(),
+        //       strMask.toUtf8().constData());
+        if (   m_data.m_dhcpserver.m_strDhcpServerAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strDhcpServerAddress == "0.0.0.0")
+            m_pDhcpAddressEditor->setText(strProp);
+        if (   m_data.m_dhcpserver.m_strDhcpServerMask.isEmpty()
+            || m_data.m_dhcpserver.m_strDhcpServerMask == "0.0.0.0")
+            m_pDhcpMaskEditor->setText(strMask);
+        if (   m_data.m_dhcpserver.m_strDhcpLowerAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strDhcpLowerAddress == "0.0.0.0")
+            m_pDhcpLowerAddressEditor->setText(strProp);
+        if (   m_data.m_dhcpserver.m_strDhcpUpperAddress.isEmpty()
+            || m_data.m_dhcpserver.m_strDhcpUpperAddress == "0.0.0.0")
+            m_pDhcpUpperAddressEditor->setText(strProp);
     }
 }
@@ -196 +219 @@
 }
 
+/* static */
+quint32 UIGlobalSettingsNetworkDetailsHost::ipv4FromQStringToQuint32(const QString &strAddress)
+{
+    quint32 uAddress = 0;
+    foreach (const QString &strPart, strAddress.split('.'))
+    {
+        uAddress = uAddress << 8;
+        bool fOk = false;
+        uint uPart = strPart.toUInt(&fOk);
+        if (fOk)
+            uAddress += uPart;
+    }
+    return uAddress;
+}
+
+/* static */
+QString UIGlobalSettingsNetworkDetailsHost::ipv4FromQuint32ToQString(quint32 uAddress)
+{
+    QStringList address;
+    while (uAddress)
+    {
+        uint uPart = uAddress & 0xFF;
+        address.prepend(QString::number(uPart));
+        uAddress = uAddress >> 8;
+    }
+    return address.join('.');
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.h

@@ -59 +59 @@
     void save();
 
+    /** Converts IPv4 address from QString to quint32. */
+    static quint32 ipv4FromQStringToQuint32(const QString &strAddress);
+    /** Converts IPv4 address from quint32 to QString. */
+    static QString ipv4FromQuint32ToQString(quint32 uAddress);
+
     /* Variable: External data reference: */
     UIDataNetworkHost &m_data;