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

Timestamp:

Jul 28, 2019 1:25:28 PM (6 years ago)

Author:

vboxsync

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

132457

Message:

Dhcpd: more logging of DHCP messages. bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Config.cpp (modified) (1 diff)
• DhcpMessage.cpp (modified) (5 diffs)
• DhcpMessage.h (modified) (2 diffs)

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

@@ -230 +230 @@
                                    pszFilename,
                                    RTLOGFLAGS_PREFIX_TIME_PROG,
-                                   "all net_dhcpd.e.l",
+                                   "all net_dhcpd.e.l.f.l3.l4.l5.l6",
                                    "VBOXDHCP_RELEASE_LOG",
                                    RTLOGDEST_FILE

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

@@ -45 +45 @@
 
 
+/**
+ * Does common message dumping.
+ */
+void DhcpMessage::dump() const RT_NOEXCEPT
+{
+    switch (m_optMessageType.value())
+    {
+        case RTNET_DHCP_MT_DISCOVER: LogRel(("DISCOVER")); break;
+        case RTNET_DHCP_MT_OFFER:    LogRel(("OFFER")); break;
+        case RTNET_DHCP_MT_REQUEST:  LogRel(("REQUEST")); break;
+        case RTNET_DHCP_MT_DECLINE:  LogRel(("DECLINE")); break;
+        case RTNET_DHCP_MT_ACK:      LogRel(("ACK")); break;
+        case RTNET_DHCP_MT_NAC:      LogRel(("NAC")); break;
+        case RTNET_DHCP_MT_RELEASE:  LogRel(("RELEASE")); break;
+        case RTNET_DHCP_MT_INFORM:   LogRel(("INFORM")); break;
+        default:
+            LogRel(("<Unknown Mesage Type %d>", m_optMessageType.value()));
+            break;
+    }
+
+    LogRel((" xid 0x%08x", m_xid));
+    LogRel((" chaddr %RTmac\n", &m_mac));
+    LogRel((" ciaddr %RTnaipv4", m_ciaddr.u));
+    if (m_yiaddr.u != 0)
+        LogRel((" yiaddr %RTnaipv4", m_yiaddr.u));
+    if (m_siaddr.u != 0)
+        LogRel((" siaddr %RTnaipv4", m_siaddr.u));
+    if (m_giaddr.u != 0)
+        LogRel((" giaddr %RTnaipv4", m_giaddr.u));
+    if (broadcast())
+        LogRel((" broadcast\n"));
+    else
+        LogRel(("\n"));
+}
+
+
 /*********************************************************************************************************************************
 *   DhcpClientMessage Implementation                                                                                             *
@@ -197 +233 @@
 
 
+/**
+ * Dumps the message.
+ */
 void DhcpClientMessage::dump() const RT_NOEXCEPT
 {
-    switch (m_optMessageType.value())
-    {
-        case RTNET_DHCP_MT_DISCOVER:
-            LogRel(("DISCOVER"));
-            break;
-
-        case RTNET_DHCP_MT_REQUEST:
-            LogRel(("REQUEST"));
-            break;
-
-        case RTNET_DHCP_MT_INFORM:
-            LogRel(("INFORM"));
-            break;
-
-        case RTNET_DHCP_MT_DECLINE:
-            LogRel(("DECLINE"));
-            break;
-
-        case RTNET_DHCP_MT_RELEASE:
-            LogRel(("RELEASE"));
-            break;
-
-        default:
-            LogRel(("<Unknown Mesage Type %d>", m_optMessageType.value()));
-            break;
-    }
+    DhcpMessage::dump();
 
     if (OptRapidCommit(*this).present())
@@ -235 +249 @@
             LogRel((" for server %RTnaipv4", sid.value().u));
 
-        LogRel((" xid 0x%08x", m_xid));
-        LogRel((" chaddr %RTmac\n", &m_mac));
-
         const OptClientId cid(*this);
-        if (cid.present()) {
+        if (cid.present())
+        {
             if (cid.value().size() > 0)
                 LogRel((" client id: %.*Rhxs\n", cid.value().size(), &cid.value().front()));
@@ -245 +257 @@
                 LogRel((" client id: <empty>\n"));
         }
-
-        LogRel((" ciaddr %RTnaipv4", m_ciaddr.u));
-        if (m_yiaddr.u != 0)
-            LogRel((" yiaddr %RTnaipv4", m_yiaddr.u));
-        if (m_siaddr.u != 0)
-            LogRel((" siaddr %RTnaipv4", m_siaddr.u));
-        if (m_giaddr.u != 0)
-            LogRel((" giaddr %RTnaipv4", m_giaddr.u));
-        LogRel(("%s\n", broadcast() ? "broadcast" : ""));
-
 
         const OptRequestedAddress reqAddr(*this);
@@ -415 +417 @@
 
     /** @todo dump it */
+    if ((LogRelIs4Enabled() && LogRelIsEnabled()) || LogIsEnabled())
+        dump();
+    if ((LogRelIs5Enabled() && LogRelIsEnabled()) || LogIs5Enabled())
+        LogRel5(("encoded message: %u bytes\n%.*Rhxd\n", data.size(), data.size(), &data.front()));
 
     return VINF_SUCCESS;
 }
+
+
+/**
+ * Dumps a server message to the log.
+ */
+void DhcpServerMessage::dump() const RT_NOEXCEPT
+{
+    DhcpMessage::dump();
+
+    /** @todo dump option details. */
+}
+

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

@@ -81 +81 @@
     }
     /** @} */
+
+    void            dump() const RT_NOEXCEPT;
 };
 
@@ -144 +146 @@
 
     int             encode(octets_t &data);
+    void            dump() const RT_NOEXCEPT;
 };