From 4621d25aaafbe146a5d8f3a6412a684e87201f5c Mon Sep 17 00:00:00 2001
From: ejurgensen <espenjurgensen@gmail.com>
Date: Thu, 10 Dec 2020 13:21:28 +0100
Subject: [PATCH] [logger] Add DHEXDUMP() for logging raw data

Substitute for Wireshark when the data exchange is encrypted
---
 src/logger.c | 115 ++++++++++++++++++++++++++++++++++++++++++---------
 src/logger.h |   3 ++
 2 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/src/logger.c b/src/logger.c
index 6f017ff9..a21e28e9 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -30,6 +30,7 @@
 #include <time.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <ctype.h> // for isprint()
 
 #include <event2/event.h>
 
@@ -110,14 +111,48 @@ repeat_count(const char *fmt)
   return logger_repeat_counter;
 }
 
+static void
+logger_write(const char *fmt, ...)
+{
+  va_list ap;
+
+  if (logfile)
+    {
+      va_start(ap, fmt);
+      vfprintf(logfile, fmt, ap);
+      va_end(ap);
+
+      fflush(logfile);
+    }
+  if (console)
+    {
+      va_start(ap, fmt);
+      vfprintf(stderr, fmt, ap);
+      va_end(ap);
+    }
+}
+
+static void
+logger_write_with_label(int severity, int domain, const char *content)
+{
+  char stamp[32];
+  time_t t;
+  struct tm timebuf;
+  int ret;
+
+  t = time(NULL);
+  ret = strftime(stamp, sizeof(stamp), "%Y-%m-%d %H:%M:%S", localtime_r(&t, &timebuf));
+  if (ret == 0)
+    stamp[0] = '\0';
+
+  logger_write("[%s] [%5s] %8s: %s", stamp, severities[severity], labels[domain], content);
+}
+
 static void
 vlogger_writer(int severity, int domain, const char *fmt, va_list args)
 {
   va_list ap;
   char content[2048];
-  char stamp[32];
-  time_t t;
-  struct tm timebuf;
   int ret;
 
   va_copy(ap, args);
@@ -134,22 +169,7 @@ vlogger_writer(int severity, int domain, const char *fmt, va_list args)
   else if (ret > LOGGER_REPEAT_MAX)
     return;
 
-  if (logfile)
-    {
-      t = time(NULL);
-      ret = strftime(stamp, sizeof(stamp), "%Y-%m-%d %H:%M:%S", localtime_r(&t, &timebuf));
-      if (ret == 0)
-	stamp[0] = '\0';
-
-      fprintf(logfile, "[%s] [%5s] %8s: %s", stamp, severities[severity], labels[domain], content);
-
-      fflush(logfile);
-    }
-
-  if (console)
-    {
-      fprintf(stderr, "[%5s] %8s: %s", severities[severity], labels[domain], content);
-    }
+  logger_write_with_label(severity, domain, content);
 }
 
 static void
@@ -189,6 +209,52 @@ vlogger(int severity, int domain, const char *fmt, va_list args)
   LOGGER_CHECK_ERR(pthread_mutex_unlock(&logger_lck));
 }
 
+static void
+hexdump(int severity, int domain, const unsigned char *data, int len, const char *heading)
+{
+  int i;
+  unsigned char buff[17];
+  const unsigned char *pc = data;
+
+  if (len <= 0)
+    return;
+
+  LOGGER_CHECK_ERR(pthread_mutex_lock(&logger_lck));
+
+  if (heading)
+    logger_write_with_label(severity, domain, heading);
+
+  for (i = 0; i < len; i++)
+    {
+      if ((i % 16) == 0)
+	{
+	  if (i != 0)
+	    logger_write("  %s\n", buff);
+
+	  logger_write(" %04x ", i);
+	}
+
+	logger_write(" %02x", pc[i]);
+
+	if (isprint(pc[i]))
+	  buff[i % 16] = pc[i];
+	else
+	  buff[i % 16] = '.';
+
+	buff[(i % 16) + 1] = '\0';
+    }
+
+  while ((i % 16) != 0)
+    {
+      logger_write("   ");
+      i++;
+    }
+
+  logger_write("  %s\n", buff);
+
+  LOGGER_CHECK_ERR(pthread_mutex_unlock(&logger_lck));
+}
+
 void
 DPRINTF(int severity, int domain, const char *fmt, ...)
 {
@@ -215,6 +281,17 @@ DVPRINTF(int severity, int domain, const char *fmt, va_list ap)
   vlogger(severity, domain, fmt, ap);
 }
 
+void
+DHEXDUMP(int severity, int domain, const unsigned char *data, int data_len, const char *heading)
+{
+  // If domain and severity do not match the current log configuration, return early to
+  // save some unnecessary code execution (tiny performance gain)
+  if (logger_initialized && (!((1 << domain) & logdomains) || (severity > threshold)))
+    return;
+
+  hexdump(severity, domain, data, data_len, heading);
+}
+
 void
 logger_ffmpeg(void *ptr, int level, const char *fmt, va_list ap)
 {
diff --git a/src/logger.h b/src/logger.h
index 2d7bd86d..8079e313 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -55,6 +55,9 @@ DPRINTF(int severity, int domain, const char *fmt, ...) __attribute__((format(pr
 void
 DVPRINTF(int severity, int domain, const char *fmt, va_list ap);
 
+void
+DHEXDUMP(int severity, int domain, const unsigned char *data, int data_len, const char *heading);
+
 void
 logger_ffmpeg(void *ptr, int level, const char *fmt, va_list ap);