log: support multiple log handles

dbus-fuzzer · Jul 11, 2022 · f10b206 · f10b206
1 parent 66c9f45
commit f10b206
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 15 deletions.
diff --git a/src/dfuzzer.c b/src/dfuzzer.c
@@ -712,10 +712,10 @@ static void df_parse_parameters(int argc, char **argv)
                                 df_supflg = 1;
                                 break;
                         case 'd':
-                                df_set_log_level(DF_LOG_LEVEL_DEBUG);
+                                df_set_log_level(DF_LOG_HANDLE_GENERAL, DF_LOG_LEVEL_DEBUG);
                                 break;
                         case 'v':
-                                df_set_log_level(DF_LOG_LEVEL_VERBOSE);
+                                df_set_log_level(DF_LOG_HANDLE_GENERAL, DF_LOG_LEVEL_VERBOSE);
                                 break;
                         case 'l':
                                 df_list_names = 1;

diff --git a/src/fuzz.c b/src/fuzz.c
@@ -405,7 +405,7 @@ static int df_fuzz_get_property(GDBusProxy *pproxy, const char *interface,
         if (!response)
                 return -1;
 
-        if (df_get_log_level() >= DF_LOG_LEVEL_DEBUG) {
+        if (df_get_log_level(DF_LOG_HANDLE_GENERAL) >= DF_LOG_LEVEL_DEBUG) {
                 g_autoptr(gchar) value_str = NULL;
                 value_str = g_variant_print(response, TRUE);
                 df_debug("Got value for property %s.%s: %s\n", interface, property->name, value_str);
@@ -467,7 +467,7 @@ static int df_fuzz_set_property(GDBusProxy *pproxy, const char *interface,
                 return 0;
         }
 
-        if (df_get_log_level() >= DF_LOG_LEVEL_DEBUG) {
+        if (df_get_log_level(DF_LOG_HANDLE_GENERAL) >= DF_LOG_LEVEL_DEBUG) {
                 g_autoptr(gchar) value_str = NULL;
                 value_str = g_variant_print(value, TRUE);
                 df_debug("Set value for property %s.%s: %s\n", interface, property->name, value_str);

diff --git a/src/log.c b/src/log.c
@@ -2,19 +2,26 @@
 
 #include "log.h"
 
-static guint8 log_level_max = DF_LOG_LEVEL_INFO;
+static guint8 log_level_max[_DF_LOG_HANDLE_MAX] = { DF_LOG_LEVEL_INFO, };
 static FILE *log_file;
 
-void df_set_log_level(guint8 log_level)
+void df_set_log_level(guint8 log_handle, guint8 log_level)
 {
+        g_assert(log_handle < _DF_LOG_HANDLE_MAX);
         g_assert(log_level < _DF_LOG_LEVEL_MAX);
 
-        log_level_max = log_level;
+        if (log_handle == DF_LOG_HANDLE_ALL)
+                for (guint8 i = 0; i < _DF_LOG_LEVEL_MAX; i++)
+                        log_level_max[i] = log_level;
+        else
+                log_level_max[log_handle] = log_level;
 }
 
-guint8 df_get_log_level(void)
+guint8 df_get_log_level(guint8 log_handle)
 {
-        return log_level_max;
+        g_assert(log_handle < _DF_LOG_LEVEL_MAX);
+
+        return log_level_max[log_handle];
 }
 
 int df_log_open_log_file(const char *file_name)
@@ -46,7 +53,7 @@ void df_log_file(const char *format, ...)
 
 void df_log_full(gint8 log_level, FILE *target, const char *format, ...)
 {
-        if (log_level > log_level_max)
+        if (log_level > log_level_max[DF_LOG_HANDLE_GENERAL])
                 return;
 
         va_list args;
@@ -59,7 +66,7 @@ void df_log_full(gint8 log_level, FILE *target, const char *format, ...)
 
 void df_error(const char *message, GError *error)
 {
-        if (log_level_max < DF_LOG_LEVEL_DEBUG)
+        if (log_level_max[DF_LOG_HANDLE_GENERAL] < DF_LOG_LEVEL_DEBUG)
                 return;
 
         fprintf(stderr, "%s: %s\n", message, error->message ?: "n/a");

diff --git a/src/log.h b/src/log.h
@@ -5,15 +5,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+enum {
+        DF_LOG_HANDLE_GENERAL = 0,
+        DF_LOG_HANDLE_COMMAND,
+        _DF_LOG_HANDLE_MAX,
+        DF_LOG_HANDLE_ALL
+};
+
 enum {
         DF_LOG_LEVEL_INFO = 0,
         DF_LOG_LEVEL_VERBOSE,
         DF_LOG_LEVEL_DEBUG,
         _DF_LOG_LEVEL_MAX
 };
 
-void df_set_log_level(guint8 log_level);
-guint8 df_get_log_level(void);
+void df_set_log_level(guint8 log_handle, guint8 log_level);
+guint8 df_get_log_level(guint8 log_handle);
 int df_log_open_log_file(const char *file_name);
 gboolean df_log_file_is_open(void);
 

diff --git a/src/override.c b/src/override.c
@@ -0,0 +1,11 @@
+#include <glib.h>
+#include <stdio.h>
+
+gboolean __wrap_g_utf8_validate(const char *str, gssize max_len, const gchar **end)
+{
+        if (end)
+                *end = str + max_len;
+
+        puts("LMAO");
+        return TRUE;
+}
diff --git a/test/test-util.c b/test/test-util.c
@@ -9,7 +9,7 @@ static void test_df_execute_external_command(void)
 {
         /* Explicitly set log level to < verbose to test commands with stdout/stderr
          * redirected to /dev/null */
-        df_set_log_level(DF_LOG_LEVEL_INFO);
+        df_set_log_level(DF_LOG_HANDLE_GENERAL, DF_LOG_LEVEL_INFO);
 
         g_assert_true(df_execute_external_command("true") == 0);
         g_assert_true(df_execute_external_command("true; echo hello world; cat /proc/$$/stat") == 0);
@@ -18,7 +18,7 @@ static void test_df_execute_external_command(void)
         g_assert_true(df_execute_external_command("this-should-not-exist") > 0);
         g_assert_true(df_execute_external_command("kill -SEGV $$") > 0);
 
-        df_set_log_level(DF_LOG_LEVEL_VERBOSE);
+        df_set_log_level(DF_LOG_HANDLE_GENERAL, DF_LOG_LEVEL_VERBOSE);
 
         g_assert_true(df_execute_external_command("true") == 0);
         g_assert_true(df_execute_external_command("true; echo hello world; cat /proc/$$/stat") == 0);