Changeset 87020 in vbox for trunk/src/VBox

Timestamp:

Dec 1, 2020 11:26:13 AM (4 years ago)

Author:

vboxsync

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

141612

Message:

Shared Clipboard/Transfers: Improved logging a bit. bugref:9874

File:

• trunk/src/VBox/Runtime/r3/http-server.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/http-server.cpp

@@ -427 +427 @@
 
 /**
+ * Logs the HTTP protocol communication to the debug logger (2).
+ *
+ * @param   pClient             Client to log communication for.
+ * @param   fWrite              Whether the server is writing (to client) or reading (from client).
+ * @param   pszData             Actual protocol communication data to log.
+ */
+static void rtHttpServerLogProto(PRTHTTPSERVERCLIENT pClient, bool fWrite, const char *pszData)
+{
+    RT_NOREF(pClient);
+
+    if (!pszData) /* Nothing to log? Bail out. */
+        return;
+
+    char **ppapszStrings;
+    size_t cStrings;
+    int rc2 = RTStrSplit(pszData, strlen(pszData), "\r\n", &ppapszStrings, &cStrings);
+    if (RT_SUCCESS(rc2))
+    {
+        for (size_t i = 0; i < cStrings; i++)
+        {
+            Log2(("%s %s\n", fWrite ? ">" : "<", ppapszStrings[i]));
+            RTStrFree(ppapszStrings[i]);
+        }
+
+        RTMemFree(ppapszStrings);
+    }
+}
+
+/**
+ * Writes HTTP protocol communication data to a connected client.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to write data to.
+ * @param   pszData             Data to write. Must be zero-terminated.
+ */
+static int rtHttpServerWriteProto(PRTHTTPSERVERCLIENT pClient, const char *pszData)
+{
+    rtHttpServerLogProto(pClient, true /* fWrite */, pszData);
+    return RTTcpWrite(pClient->hSocket, pszData, strlen(pszData));
+}
+
+/**
  * Main function for sending a response back to the client.
  *
@@ -487 +529 @@
         rc = RTStrAAppend(&pszHdr, "\r\n");
         if (RT_SUCCESS(rc))
-            rc = RTTcpWrite(pClient->hSocket, pszHdr, strlen(pszHdr));
+            rc = rtHttpServerWriteProto(pClient, pszHdr);
     }
 
@@ -982 +1024 @@
             && cbReadTotal)
         {
-            LogFlowFunc(("Received request (%zu bytes):\n%s\n\n", cbReadTotal, pszReq));
+            LogFlowFunc(("Received client request (%zu bytes)\n", cbReadTotal));
+
+            rtHttpServerLogProto(pClient, false /* fWrite */, szReq);
 
             rc = rtHttpServerProcessRequest(pClient, szReq, cbReadTotal);