Changeset 79778 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2019 12:36:08 AM (5 years ago)

Author:

vboxsync

Message:

Main: s/DHCPOptionEncoding_Legacy/DHCPOptionEncoding_Normal/g as 'Legacy' does not seem a good fit for the more userfriendly value encoding. bugref:9288

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDHCPServer.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-server/DHCPConfigImpl.cpp (modified) (4 diffs)
• Main/src-server/DHCPServerImpl.cpp (modified) (3 diffs)
• Main/xml/Settings.cpp (modified) (3 diffs)
• NetworkServices/Dhcpd/Config.cpp (modified) (2 diffs)
• NetworkServices/Dhcpd/DhcpOptions.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp

@@ -511 +511 @@
                         if (ptrConfig.isNull())
                             return RTEXITCODE_FAILURE;
-                        CHECK_ERROR2I_STMT(ptrConfig, SetOption((DhcpOpt_T)idAddOpt, DHCPOptionEncoding_Legacy,
+                        CHECK_ERROR2I_STMT(ptrConfig, SetOption((DhcpOpt_T)idAddOpt, DHCPOptionEncoding_Normal,
                                                                 Bstr(ValueUnion.psz).raw()), rcExit = RTEXITCODE_FAILURE);
                     }
@@ -780 +780 @@
                         if (ptrConfig.isNull())
                             return RTEXITCODE_FAILURE;
-                        CHECK_ERROR2I_STMT(ptrConfig, SetOption((DhcpOpt_T)u8OptId, DHCPOptionEncoding_Legacy,
+                        CHECK_ERROR2I_STMT(ptrConfig, SetOption((DhcpOpt_T)u8OptId, DHCPOptionEncoding_Normal,
                                                                 Bstr(ValueUnion.psz).raw()), rcExit = RTEXITCODE_FAILURE);
                     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -834 +834 @@
             switch (Encodings[i])
             {
-                case DHCPOptionEncoding_Legacy:
+                case DHCPOptionEncoding_Normal:
                     RTPrintf("      %3d/legacy: %ls\n", Options[i], Values[i]);
                     break;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1832 +1832 @@
       name="DHCPOptionEncoding"
       uuid="84b6d460-2838-4682-c0d6-ef5b573ef28a">
-    <const name="Legacy" value="0"/>
+    <const name="Normal" value="0"/>
     <const name="Hex"    value="1"/>
   </enum>

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

@@ -338 +338 @@
     HRESULT hrc = DHCPConfig::i_initWithDefaults(a_pVirtualBox, a_pParent);
     if (SUCCEEDED(hrc))
-        hrc = i_setOption(DhcpOpt_SubnetMask, DHCPOptionEncoding_Legacy, "0.0.0.0");
+        hrc = i_setOption(DhcpOpt_SubnetMask, DHCPOptionEncoding_Normal, "0.0.0.0");
 
     if (SUCCEEDED(hrc))
@@ -389 +389 @@
     if (it != m_OptionMap.end())
     {
-        if (it->second.enmEncoding == DHCPOptionEncoding_Legacy)
+        if (it->second.enmEncoding == DHCPOptionEncoding_Normal)
             return a_rDst.assignEx(it->second.strValue);
         return setError(VBOX_E_OBJECT_NOT_FOUND, tr("DHCP option DhcpOpt_SubnetMask is not in a legacy encoding"));
@@ -412 +412 @@
         return setErrorBoth(E_INVALIDARG, vrc, tr("Invalid IPv4 netmask '%s': %Rrc"), a_rSrc.c_str(), vrc);
 
-    return i_setOption(DhcpOpt_SubnetMask, DHCPOptionEncoding_Legacy, a_rSrc);
+    return i_setOption(DhcpOpt_SubnetMask, DHCPOptionEncoding_Normal, a_rSrc);
 }
 
@@ -421 +421 @@
 HRESULT DHCPGlobalConfig::i_setOption(DhcpOpt_T aOption, DHCPOptionEncoding_T aEncoding, const com::Utf8Str &aValue)
 {
-    if (aOption != DhcpOpt_SubnetMask || aEncoding == DHCPOptionEncoding_Legacy)
+    if (aOption != DhcpOpt_SubnetMask || aEncoding == DHCPOptionEncoding_Normal)
         return DHCPConfig::i_setOption(aOption, aEncoding, aValue);
-    return setError(E_FAIL, tr("DhcpOpt_SubnetMask must use DHCPOptionEncoding_Legacy as it is reflected by IDHCPServer::networkMask"));
+    return setError(E_FAIL, tr("DhcpOpt_SubnetMask must use DHCPOptionEncoding_Normal as it is reflected by IDHCPServer::networkMask"));
 }
 

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

@@ -591 +591 @@
     switch (enmEncoding)
     {
-        case DHCPOptionEncoding_Legacy:
+        case DHCPOptionEncoding_Normal:
         {
             /*
@@ -663 +663 @@
 {
     if (aOption != 0)
-        return aTargetConfig.i_setOption(aOption, DHCPOptionEncoding_Legacy, aValue);
+        return aTargetConfig.i_setOption(aOption, DHCPOptionEncoding_Normal, aValue);
 
     /*
@@ -682 +682 @@
         case ':':           /* support legacy format too */
         {
-            enmEncoding = DHCPOptionEncoding_Legacy;
+            enmEncoding = DHCPOptionEncoding_Normal;
             break;
         }

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1616 +1616 @@
 DhcpOptValue::DhcpOptValue()
     : strValue()
-    , enmEncoding(DHCPOptionEncoding_Legacy)
+    , enmEncoding(DHCPOptionEncoding_Normal)
 {
 }
@@ -1810 +1810 @@
             pElmOption->setAttribute("name", it->first);
             pElmOption->setAttribute("value", it->second.strValue);
-            if (it->second.enmEncoding != DHCPOptionEncoding_Legacy)
+            if (it->second.enmEncoding != DHCPOptionEncoding_Normal)
                 pElmOption->setAttribute("encoding", (int32_t)it->second.enmEncoding);
         }
@@ -1945 +1945 @@
         int32_t iOptEnc;
         if (!pElmOption->getAttributeValue("encoding", iOptEnc))
-            iOptEnc = DHCPOptionEncoding_Legacy;
+            iOptEnc = DHCPOptionEncoding_Normal;
 
         rConfig.mapOptions[OptName] = DhcpOptValue(strValue, (DHCPOptionEncoding_T)iOptEnc);

trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

@@ -709 +709 @@
 
     /* The opional 'encoding' attribute: */
-    uint32_t u32Enc = 0;            /* XXX: DhcpOptEncoding_Legacy */
+    uint32_t u32Enc = 0;            /* XXX: DHCPOptionEncoding_Normal */
     const char *pszEncoding;
     if (pElmOption->getAttributeValue("encoding", &pszEncoding))
@@ -719 +719 @@
         switch (u32Enc)
         {
-            case 0:                 /* XXX: DhcpOptEncoding_Legacy */
-            case 1:                 /* XXX: DhcpOptEncoding_Hex */
+            case 0:                 /* XXX: DHCPOptionEncoding_Normal */
+            case 1:                 /* XXX: DHCPOptionEncoding_Hex */
                 break;
             default:

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp

@@ -293 +293 @@
     switch (aEnc)
     {
-        case 0: /* DhcpOptEncoding_Legacy */
+        case 0: /* DHCPOptionEncoding_Normal */
             switch (aOptCode)
             {