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

Timestamp:

Jul 9, 2019 1:14:53 AM (5 years ago)

Author:

vboxsync

Message:

Dhcpd,Main/DHCPServerImpl: LeasesFilename should be plural everywhere. Moved default calc in dhcpd into the config class. bugref:9288

Location:

trunk/src/VBox/Main

Files:

• include/DHCPServerImpl.h (modified) (1 diff)
• src-server/DHCPServerImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/DHCPServerImpl.h

@@ -139 +139 @@
     /** @name Helpers
      * @{  */
-    HRESULT i_calcLeaseFilename(const com::Utf8Str &aNetwork) RT_NOEXCEPT;
+    HRESULT i_calcLeasesFilename(const com::Utf8Str &aNetwork) RT_NOEXCEPT;
     /** @} */
 

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

@@ -66 +66 @@
 
     char tempConfigFileName[RTPATH_MAX];
-    com::Utf8Str strLeaseFilename;
+    com::Utf8Str strLeasesFilename;
     com::Utf8Str networkName;
     com::Utf8Str trunkName;
@@ -696 +696 @@
     m->trunkName   = aTrunkName;
     m->trunkType   = aTrunkType;
-    HRESULT hrc = i_calcLeaseFilename(aNetworkName);
+    HRESULT hrc = i_calcLeasesFilename(aNetworkName);
     if (FAILED(hrc))
         return hrc;
@@ -732 +732 @@
     pElmRoot->setAttribute("lowerIP", m->lowerIP);
     pElmRoot->setAttribute("upperIP", m->upperIP);
-    pElmRoot->setAttribute("leaseFilename", m->strLeaseFilename);
+    pElmRoot->setAttribute("leasesFilename", m->strLeasesFilename);
 
     /* Process global options */
@@ -866 +866 @@
      */
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (m->strLeaseFilename.isEmpty())
-    {
-        HRESULT hrc = i_calcLeaseFilename(m->networkName.isEmpty() ? mName : m->networkName);
+    if (m->strLeasesFilename.isEmpty())
+    {
+        HRESULT hrc = i_calcLeasesFilename(m->networkName.isEmpty() ? mName : m->networkName);
         if (FAILED(hrc))
             return hrc;
@@ -886 +886 @@
         {
             xml::XmlFileParser parser;
-            parser.read(m->strLeaseFilename.c_str(), doc);
+            parser.read(m->strLeasesFilename.c_str(), doc);
         }
         catch (const xml::EIPRTFailure &e)
@@ -912 +912 @@
             }
             return setErrorBoth(VBOX_E_FILE_ERROR, vrc, "Reading '%s' failed: %Rrc - %s",
-                                m->strLeaseFilename.c_str(), vrc, e.what());
+                                m->strLeasesFilename.c_str(), vrc, e.what());
         }
         catch (const RTCError &e)
         {
             if (e.what())
-                return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: %s", m->strLeaseFilename.c_str(), e.what());
-            return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: RTCError", m->strLeaseFilename.c_str());
+                return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: %s", m->strLeasesFilename.c_str(), e.what());
+            return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: RTCError", m->strLeasesFilename.c_str());
         }
         catch (std::bad_alloc &)
@@ -927 +927 @@
         {
             AssertFailed();
-            return setError(VBOX_E_FILE_ERROR, tr("Reading '%s' failed: Unexpected exception"), m->strLeaseFilename.c_str());
+            return setError(VBOX_E_FILE_ERROR, tr("Reading '%s' failed: Unexpected exception"), m->strLeasesFilename.c_str());
         }
 
@@ -988 +988 @@
 
 /**
- * Calculates and updates the value of strLeaseFilename given @a aNetwork.
+ * Calculates and updates the value of strLeasesFilename given @a aNetwork.
  */
-HRESULT DHCPServer::i_calcLeaseFilename(const com::Utf8Str &aNetwork)
+HRESULT DHCPServer::i_calcLeasesFilename(const com::Utf8Str &aNetwork)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /* The lease file must be the same as we used the last time, so careful when changing this code. */
-    int vrc = m->strLeaseFilename.assignNoThrow(mVirtualBox->i_homeDir());
+    int vrc = m->strLeasesFilename.assignNoThrow(mVirtualBox->i_homeDir());
     if (RT_SUCCESS(vrc))
-        vrc = RTPathAppendCxx(m->strLeaseFilename, aNetwork);
+        vrc = RTPathAppendCxx(m->strLeasesFilename, aNetwork);
     if (RT_SUCCESS(vrc))
-        vrc = m->strLeaseFilename.appendNoThrow("-Dhcpd.leases");
+        vrc = m->strLeasesFilename.appendNoThrow("-Dhcpd.leases");
     if (RT_SUCCESS(vrc))
     {
-        RTPathPurgeFilename(RTPathFilename(m->strLeaseFilename.mutableRaw()), RTPATH_STR_F_STYLE_HOST);
-        m->strLeaseFilename.jolt();
+        RTPathPurgeFilename(RTPathFilename(m->strLeasesFilename.mutableRaw()), RTPATH_STR_F_STYLE_HOST);
+        m->strLeasesFilename.jolt();
         return S_OK;
     }