Changeset 79866 in vbox

Timestamp:

Jul 18, 2019 8:32:47 PM (6 years ago)

Author:

vboxsync

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

132264

Message:

Main/DHCPServer: Fixes to logging, individual vm/slot configs, and completed option forcing/suppression. bugref:9288

Location:

trunk/src/VBox/Main/src-server

Files:

• DHCPConfigImpl.cpp (modified) (2 diffs)
• DHCPServerImpl.cpp (modified) (4 diffs)

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

@@ -84 +84 @@
             char    *pszNext;
             int vrc = RTStrToUInt8Ex(psz, &pszNext, 10, &bOpt);
-            if (vrc == VINF_SUCCESS || vrc == VWRN_TRAILING_SPACES)
+            if (   vrc == VINF_SUCCESS
+                || vrc == VWRN_TRAILING_SPACES
+                || vrc == VWRN_TRAILING_CHARS)
             {
                 try
@@ -525 +527 @@
         pElmConfig->setAttribute("secMaxLeaseTime", (uint32_t)m_secMaxLeaseTime);
 
+    struct
+    {
+        const char                *pszElement;
+        std::vector<DHCPOption_T> *pVec;
+    } aVec2Elm[] =  { { "ForcedOption", &m_vecForcedOptions }, { "SuppressedOption", &m_vecSuppressedOptions }, };
+    for (size_t i = 0; i < RT_ELEMENTS(aVec2Elm); i++)
+        for (std::vector<DHCPOption_T>::const_iterator it = aVec2Elm[i].pVec->begin(); it != aVec2Elm[i].pVec->end(); ++it)
+        {
+            xml::ElementNode *pElmChild = pElmConfig->createChild(aVec2Elm[i].pszElement);
+            pElmChild->setAttribute("name", (int)*it);
+        }
+
     for (settings::DhcpOptionMap::const_iterator it = m_OptionMap.begin(); it != m_OptionMap.end(); ++it)
     {
-        xml::ElementNode *pOption = pElmConfig->createChild("Option");
-        pOption->setAttribute("name", (int)it->first);
-        pOption->setAttribute("encoding", it->second.enmEncoding);
-        pOption->setAttribute("value", it->second.strValue);
+        xml::ElementNode *pElmOption = pElmConfig->createChild("Option");
+        pElmOption->setAttribute("name", (int)it->first);
+        pElmOption->setAttribute("encoding", it->second.enmEncoding);
+        pElmOption->setAttribute("value", it->second.strValue);
     }
 }

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

@@ -257 +257 @@
         ComObjPtr<DHCPIndividualConfig> ptrIndiCfg;
         com::Utf8Str                    strKey;
-        if (!it->second.strVMName.isNotEmpty())
+        if (it->second.strVMName.isEmpty())
         {
             RTMAC MACAddress;
@@ -282 +282 @@
             if (SUCCEEDED(hrc))
             {
+                int vrc = strKey.printfNoThrow("%RTuuid/%u", idMachine.raw(), it->second.uSlot);
+                AssertRCReturn(vrc, E_OUTOFMEMORY);
+
                 hrc = ptrIndiCfg.createObject();
                 if (SUCCEEDED(hrc))
@@ -851 +854 @@
                     {
                         m->individualConfigs[strKey] = a_rPtrConfig;
-                        return S_OK;
+
+                        /* Save settings. */
+                        alock.release();
+                        return i_doSaveSettings();
                     }
                     catch (std::bad_alloc &)
@@ -1151 +1157 @@
                 vrc = m->dhcp.addArgPair("--config", m->strConfigFilename.c_str());
             if (RT_SUCCESS(vrc))
-                vrc = m->dhcp.addArgPair("--log", m->networkName.c_str());
+                vrc = m->dhcp.addArgPair("--log", m->strLogFilename.c_str());
             /** @todo Add --log-flags, --log-group-settings, and --log-destinations with
              *        associated IDHCPServer attributes.  (Not doing it now because that'll