Changeset 79563 in vbox for trunk/src/VBox/NetworkServices/Dhcpd/Db.cpp

Timestamp:

Jul 6, 2019 1:22:56 AM (6 years ago)

Author:

vboxsync

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

131853

Message:

Dhcpd: Went over the Dhcpd and related code adding comments and doing some exception vetting. bugref:9288

File:

• trunk/src/VBox/NetworkServices/Dhcpd/Db.cpp (modified) (15 diffs)

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

@@ -36 +36 @@
  * Registers the ClientId format type callback ("%R[binding]").
  */
-void Binding::registerFormat()
+void Binding::registerFormat() RT_NOEXCEPT
 {
     if (!g_fFormatRegistered)
@@ -87 +87 @@
 }
 
-const char *Binding::stateName() const
+const char *Binding::stateName() const RT_NOEXCEPT
 {
     switch (m_state)
@@ -108 +108 @@
 
 
-Binding &Binding::setState(const char *pszStateName)
+Binding &Binding::setState(const char *pszStateName) RT_NOEXCEPT
 {
     if (strcmp(pszStateName, "free") == 0)
@@ -137 +137 @@
  * @param   tsDeadline          The expiry deadline to use.
  */
-bool Binding::expire(Timestamp tsDeadline)
+bool Binding::expire(Timestamp tsDeadline) RT_NOEXCEPT
 {
     if (m_state <= Binding::EXPIRED)
@@ -232 +232 @@
         /*
          * Decode from "de:ad:be:ef".
-         * XXX: RTStrConvertHexBytes() doesn't grok colons
          */
-        size_t cbBytes = strId.length() / 2;
-        uint8_t *pBytes = new uint8_t[cbBytes];
-        rc = RTStrConvertHexBytes(strId.c_str(), pBytes, cbBytes, 0);
+        /** @todo RTStrConvertHexBytes() doesn't grok colons */
+        size_t   cbBytes = strId.length() / 2;
+        uint8_t *pbBytes = new uint8_t[cbBytes];
+        rc = RTStrConvertHexBytes(strId.c_str(), pbBytes, cbBytes, 0);
         if (RT_SUCCESS(rc))
         {
-            std::vector<uint8_t> rawopt(pBytes, pBytes + cbBytes);
-            id = OptClientId(rawopt);
-        }
-        delete[] pBytes;
+            try
+            {
+                std::vector<uint8_t> rawopt(pbBytes, pbBytes + cbBytes);
+                id = OptClientId(rawopt);
+            }
+            catch (std::bad_alloc &)
+            {
+                delete[] pbBytes;
+                throw;
+            }
+        }
+        delete[] pbBytes;
     }
 
@@ -305 +313 @@
     }
     else
-    {   /* XXX: old code wrote timestamps instead of absolute time. */
+    {   /** @todo XXX: old code wrote timestamps instead of absolute time. */
         /* pretend that lease has just ended */
         Timestamp fakeIssued = Timestamp::now();
@@ -341 +349 @@
     m_pConfig = pConfig;
 
-    m_pool.init(pConfig->getIPv4PoolFirst(),
-                pConfig->getIPv4PoolLast());
-
-    return VINF_SUCCESS;
+    return m_pool.init(pConfig->getIPv4PoolFirst(), pConfig->getIPv4PoolLast());
 }
 
@@ -351 +356 @@
  * Expire old binding (leases).
  */
-void Db::expire()
+void Db::expire() RT_NOEXCEPT
 {
     const Timestamp now = Timestamp::now();
@@ -609 +614 @@
  * @param   pNewBinding     The new binding to add.
  */
-int Db::i_addBinding(Binding *pNewBinding)
+int Db::i_addBinding(Binding *pNewBinding) RT_NOEXCEPT
 {
     /*
@@ -662 +667 @@
  * @param   req                 The DHCP request.
  */
-void Db::cancelOffer(const DhcpClientMessage &req)
+void Db::cancelOffer(const DhcpClientMessage &req) RT_NOEXCEPT
 {
     const OptRequestedAddress reqAddr(req);
@@ -697 +702 @@
  * @param   req                 The DHCP request.
  * @returns true if found and released, otherwise false.
- */
-bool Db::releaseBinding(const DhcpClientMessage &req)
+ * @throws  nothing
+ */
+bool Db::releaseBinding(const DhcpClientMessage &req) RT_NOEXCEPT
 {
     const RTNETADDRIPV4 addr = req.ciaddr();
@@ -726 +732 @@
  * @param   strFilename         The file to write it to.
  */
-int Db::writeLeases(const RTCString &strFilename) const
+int Db::writeLeases(const RTCString &strFilename) const RT_NOEXCEPT
 {
     LogDHCP(("writing leases to %s\n", strFilename.c_str()));
+
+    /** @todo This could easily be written directly to the file w/o going thru
+     *        a xml::Document, xml::XmlFileWriter, hammering the heap and being
+     *        required to catch a lot of different exceptions at various points.
+     *        (RTStrmOpen, bunch of RTStrmPrintf using \%RMas and \%RMes.,
+     *        RTStrmClose closely followed by a couple of renames.)
+     */
 
     /*
@@ -789 +802 @@
  * @returns IPRT status code.
  * @param   strFilename         The file to load it from.
- */
-int Db::loadLeases(const RTCString &strFilename)
+ * @throws  nothing
+ */
+int Db::loadLeases(const RTCString &strFilename) RT_NOEXCEPT
 {
     LogDHCP(("loading leases from %s\n", strFilename.c_str()));
@@ -863 +877 @@
  * @return  IPRT status code.
  */
-int Db::i_loadLease(const xml::ElementNode *pElmLease)
+int Db::i_loadLease(const xml::ElementNode *pElmLease) RT_NOEXCEPT
 {
     Binding *pBinding = NULL;
@@ -878 +892 @@
         bool fExpired = pBinding->expire();
         if (!fExpired)
-            LogDHCP(("> LOAD: lease %R[binding]\n", pBinding));
+            LogDHCP(("> LOAD:         lease %R[binding]\n", pBinding));
         else
             LogDHCP(("> LOAD: EXPIRED lease %R[binding]\n", pBinding));