Changeset 79613 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jul 8, 2019 11:50:48 PM (6 years ago)

Author:

vboxsync

Message:

Dhcpd: Made the lease database filename configurable so Main can decide exactly where it is and what's it called in order to correctly implement IDCHPServer::FindLeaseByMAC. Use RTPathPurgeFilename to create the default lease filename. Added a todo regarding a bogus looking message option in an ACK. bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Config.cpp (modified) (3 diffs)
• Config.h (modified) (2 diffs)
• DHCPD.cpp (modified) (3 diffs)

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

@@ -169 +169 @@
     {
         m_strBaseName = m_strNetwork;
-
-/** @todo make IPRT function for this.   */
-        char ch;
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        static const char s_szIllegals[] = "/\\\"*:<>?|\t\v\n\r\f\a\b"; /** @todo all control chars... */
-        for (char *psz = m_strBaseName.mutableRaw(); (ch = *psz) != '\0'; ++psz)
-            if (strchr(s_szIllegals, ch))
-                *psz = '_';
-#else
-        for (char *psz = m_strBaseName.mutableRaw(); (ch = *psz) != '\0'; ++psz)
-            if (RTPATH_IS_SEP(ch))
-                *psz = '_';
-#endif
-        m_strBaseName.jolt(); /* Not really necessary, but it's protocol. */
+        RTPathPurgeFilename(m_strBaseName.mutableRaw(), RTPATH_STR_F_STYLE_HOST);
+        m_strBaseName.jolt();
     }
     else
@@ -260 +248 @@
         RTUUID Uuid;
         int rc = RTUuidCreate(&Uuid);
-        AssertReturn(rc, rc);
+        AssertRCReturn(rc, rc);
 
         m_MacAddress.au8[0] = 0x08;
@@ -747 +735 @@
         m_strTrunk = "";
 
+    m_strLeaseFilename = pElmServer->findAttributeValue("leaseFilename"); /* optional */
+
     i_getIPv4AddrAttribute(pElmServer, "IPAddress", &m_IPv4Address);
     i_getIPv4AddrAttribute(pElmServer, "networkMask", &m_IPv4Netmask);

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

@@ -46 +46 @@
     RTCString       m_strNetwork;       /**< The name of the internal network the DHCP server is connected to. */
     RTCString       m_strBaseName;      /**< m_strNetwork sanitized to be usable in a path component. */
+    RTCString       m_strLeaseFilename; /**< The lease filename if one given.  Dhcpd will pick a default if empty. */
 
     RTCString       m_strTrunk;         /**< The trunk name of the internal network. */
@@ -91 +92 @@
 
     const RTCString    &getNetwork() const RT_NOEXCEPT          { return m_strNetwork; }
+    const RTCString    &getBaseName() const RT_NOEXCEPT         { return m_strBaseName; }
+    const RTCString    &getLeaseFilename() const RT_NOEXCEPT    { return m_strLeaseFilename; }
 
-    const RTCString    &getBaseName() const RT_NOEXCEPT         { return m_strBaseName; }
     const RTCString    &getTrunk() const RT_NOEXCEPT            { return m_strTrunk; }
     INTNETTRUNKTYPE     getTrunkType() const RT_NOEXCEPT        { return m_enmTrunkType; }

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

@@ -45 +45 @@
     AssertReturn(!m_pConfig, VERR_INVALID_STATE);
 
-    /** @todo r=bird: This must be configurable so main can read the database and
-     * fish assignments out of it.  (That's the most efficient and accurate way of
-     * figuring  out the IP address of a VM.) */
-
     /* leases filename */
-    int rc = m_strLeasesFilename.assignNoThrow(pConfig->getHome());
-    if (RT_SUCCESS(rc))
-        rc = RTPathAppendCxx(m_strLeasesFilename, pConfig->getBaseName());
-    if (RT_SUCCESS(rc))
-        rc = m_strLeasesFilename.appendNoThrow("-Dhcpd.leases");
+    int rc;
+    if (pConfig->getLeaseFilename().isEmpty())
+        rc = m_strLeasesFilename.assignNoThrow(pConfig->getLeaseFilename());
+    else
+    {
+        rc = m_strLeasesFilename.assignNoThrow(pConfig->getHome());
+        if (RT_SUCCESS(rc))
+            rc = RTPathAppendCxx(m_strLeasesFilename, pConfig->getBaseName());
+        if (RT_SUCCESS(rc))
+            rc = m_strLeasesFilename.appendNoThrow("-Dhcpd.leases");
+    }
     if (RT_SUCCESS(rc))
     {
@@ -322 +324 @@
     if (req.ciaddr().u != 0 && reqAddr.present() && reqAddr.value().u != req.ciaddr().u)
     {
-        std::unique_ptr<DhcpServerMessage> nak (
-            i_createMessage(RTNET_DHCP_MT_NAC, req)
-        );
+        std::unique_ptr<DhcpServerMessage> nak(i_createMessage(RTNET_DHCP_MT_NAC, req));
         nak->addOption(OptMessage("Requested address does not match ciaddr"));
         return nak.release();
@@ -349 +349 @@
     ack->addOptions(m_pConfig->getOptions(replyOptions, optlist, req.clientId()));
 
+    /** @todo r=bird: Sec 9.9 in rfc-2132 indicates the server only sends this in NACKs. Test code? */
     ack->addOption(OptMessage("Ok, ok, here it is"));