Changeset 79622 in vbox for trunk/src/VBox/NetworkServices/Dhcpd

Timestamp:

Jul 9, 2019 1:21:16 AM (5 years ago)

Author:

vboxsync

Message:

Dhcpd: DHCP_LOG_MSG_ERROR. bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Config.cpp (modified) (4 diffs)
• DHCPD.cpp (modified) (1 diff)
• DhcpdInternal.h (modified) (1 diff)
• VBoxNetDhcpd.cpp (modified) (2 diffs)

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

@@ -108 +108 @@
         rc = m_strHome.assignNoThrow(szHome);
     else
-    {
-        LogFunc(("unable to locate the VirtualBox home directory: %Rrc", rc)); /* no release log at this point. */
-        RTMsgError("unable to locate the VirtualBox home directory: %Rrs", rc);
-    }
+        DHCP_LOG_MSG_ERROR(("unable to locate the VirtualBox home directory: %Rrc\n", rc));
     return rc;
 }
@@ -587 +584 @@
     if (pszFileName == NULL || pszFileName[0] == '\0')
     {
-        RTMsgError("Empty configuration filename");
+        DHCP_LOG_MSG_ERROR(("Config::i_read: Empty configuration filename\n"));
         return NULL;
     }
@@ -599 +596 @@
     catch (const xml::EIPRTFailure &e)
     {
-        LogFunc(("%s\n", e.what()));
-        RTMsgError("%s\n", e.what());
+        DHCP_LOG_MSG_ERROR(("Config::i_read: %s\n", e.what()));
         return NULL;
     }
     catch (const RTCError &e)
     {
-        LogFunc(("%s\n", e.what()));
-        RTMsgError("%s\n", e.what());
+        DHCP_LOG_MSG_ERROR(("Config::i_read: %s\n", e.what()));
         return NULL;
     }
     catch (...)
     {
-        LogFunc(("Unknown exception while reading and parsing '%s'\n", pszFileName));
-        RTMsgError("Unknown exception while reading and parsing '%s'\n", pszFileName);
+        DHCP_LOG_MSG_ERROR(("Config::i_read: Unknown exception while reading and parsing '%s'\n", pszFileName));
         return NULL;
     }
@@ -625 +619 @@
     catch (const RTCError &e)
     {
-        LogFunc(("%s\n", e.what()));
-        RTMsgError("%s\n", e.what());
+        DHCP_LOG_MSG_ERROR(("Config::i_read: %s\n", e.what()));
         return NULL;
     }
     catch (std::bad_alloc &)
     {
-        LogFunc(("std::bad_alloc\n"));
-        RTMsgError("std::bad_alloc reading config\n");
+        DHCP_LOG_MSG_ERROR(("Config::i_read: std::bad_alloc\n"));
         return NULL;
     }
     catch (...)
     {
-        LogFunc(("Unexpected exception\n"));
-        RTMsgError("Unexpected exception\n");
+        DHCP_LOG_MSG_ERROR(("Config::i_read: Unexpected exception\n"));
         return NULL;
     }

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

@@ -53 +53 @@
             return VINF_SUCCESS;
 
-        /** @todo macro for this: */
-        LogRel((   "Ran out of memory loading leases from '%s'.  Try rename or delete the file.\n",
-                   pConfig->getLeasesFilename().c_str()));
-        RTMsgError("Ran out of memory loading leases from '%s'.  Try rename or delete the file.\n",
-                   pConfig->getLeasesFilename().c_str());
+        DHCP_LOG_MSG_ERROR(("Ran out of memory loading leases from '%s'.  Try rename or delete the file.\n",
+                            pConfig->getLeasesFilename().c_str()));
     }
     return rc;

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

@@ -78 +78 @@
 /** @} */
 
+/** LogRel + RTMsgError helper. */
+#define DHCP_LOG_MSG_ERROR(a_MsgArgs)       do { LogRel(a_MsgArgs);     RTMsgError a_MsgArgs; } while (0)
+
 #endif /* !VBOX_INCLUDED_SRC_Dhcpd_DhcpdInternal_h */

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

@@ -380 +380 @@
         else
         {
-            LogRel(("ifWait failed: %Rrc\n", rc));
-            RTMsgError("ifWait failed: %Rrc", rc);
+            DHCP_LOG_MSG_ERROR(("ifWait failed: %Rrc\n", rc));
             return;
         }
@@ -663 +662 @@
             }
             else
-                RTMsgError("Terminating - vboxLwipCoreInitialize failed: %Rrc", rc);
+                DHCP_LOG_MSG_ERROR(("Terminating - vboxLwipCoreInitialize failed: %Rrc\n", rc));
         }
         else
-            RTMsgError("Terminating - ifInit failed: %Rrc", rc);
+            DHCP_LOG_MSG_ERROR(("Terminating - ifInit failed: %Rrc\n", rc));
     }
     else
-        RTMsgError("Terminating - Dhcpd::init failed: %Rrc", rc);
+        DHCP_LOG_MSG_ERROR(("Terminating - Dhcpd::init failed: %Rrc\n", rc));
     return rc;
 }