debug: Add nice_debug_set_from_string() API to set extra debug cats

This allows changing the debug cats more or less at runtime.

agent/debug.c

@@ -83,46 +83,59 @@ stun_handler (const char *format, va_list ap)
   g_logv ("libnice-stun", G_LOG_LEVEL_DEBUG, format, ap);
 }
 
-void nice_debug_init (void)
+void
+nice_debug_set_from_string (const gchar *extra_string)
 {
-  static gboolean debug_initialized = FALSE;
   const gchar *flags_string;
   const gchar *gflags_string;
   guint flags = 0;
 
+  flags_string = g_getenv ("NICE_DEBUG");
+  gflags_string = g_getenv ("G_MESSAGES_DEBUG");
+
+  if (flags_string)
+    flags = g_parse_debug_string (flags_string, keys,  4);
+
+  if (gflags_string)
+    flags |= g_parse_debug_string (gflags_string, gkeys,  4);
+  if (gflags_string && strstr (gflags_string, "libnice-pseudotcp-verbose"))
+    flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
+  if (gflags_string && strstr (gflags_string, "libnice-verbose"))
+    flags |= NICE_DEBUG_NICE_VERBOSE;
+
+  if (extra_string)
+    flags |= g_parse_debug_string (extra_string, gkeys,  4);
+  if (extra_string && strstr (extra_string, "libnice-pseudotcp-verbose"))
+    flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
+  if (extra_string && strstr (extra_string, "libnice-verbose"))
+    flags |= NICE_DEBUG_NICE_VERBOSE;
+
+  stun_set_debug_handler (stun_handler);
+  debug_enabled = !!(flags & NICE_DEBUG_NICE);
+  if (flags & NICE_DEBUG_STUN)
+    stun_debug_enable ();
+  else
+    stun_debug_disable ();
+
+  if (flags & NICE_DEBUG_NICE_VERBOSE)
+    debug_verbose_enabled = TRUE;
+
+  /* Set verbose before normal so that if we use 'all', then only
+     normal debug is enabled, we'd need to set pseudotcp-verbose without the
+     pseudotcp flag in order to actually enable verbose pseudotcp */
+  if (flags & NICE_DEBUG_PSEUDOTCP_VERBOSE)
+    pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_VERBOSE);
+  else if (flags & NICE_DEBUG_PSEUDOTCP)
+    pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_NORMAL);
+}
+
+void nice_debug_init (void)
+{
+  static gboolean debug_initialized = FALSE;
+
   if (!debug_initialized) {
     debug_initialized = TRUE;
-
-    flags_string = g_getenv ("NICE_DEBUG");
-    gflags_string = g_getenv ("G_MESSAGES_DEBUG");
-
-    if (flags_string)
-      flags = g_parse_debug_string (flags_string, keys,  4);
-    if (gflags_string)
-      flags |= g_parse_debug_string (gflags_string, gkeys,  4);
-    if (gflags_string && strstr (gflags_string, "libnice-pseudotcp-verbose"))
-      flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
-    if (gflags_string && strstr (gflags_string, "libnice-verbose")) {
-      flags |= NICE_DEBUG_NICE_VERBOSE;
-    }
-
-    stun_set_debug_handler (stun_handler);
-    debug_enabled = !!(flags & NICE_DEBUG_NICE);
-    if (flags & NICE_DEBUG_STUN)
-      stun_debug_enable ();
-    else
-      stun_debug_disable ();
-
-    if (flags & NICE_DEBUG_NICE_VERBOSE)
-      debug_verbose_enabled = TRUE;
-
-    /* Set verbose before normal so that if we use 'all', then only
-       normal debug is enabled, we'd need to set pseudotcp-verbose without the
-       pseudotcp flag in order to actually enable verbose pseudotcp */
-    if (flags & NICE_DEBUG_PSEUDOTCP_VERBOSE)
-      pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_VERBOSE);
-    else if (flags & NICE_DEBUG_PSEUDOTCP)
-      pseudo_tcp_set_debug_level (PSEUDO_TCP_DEBUG_NORMAL);
+    nice_debug_set_from_string (NULL);
   }
 }
 

agent/debug.h

@@ -99,6 +99,19 @@ void nice_debug_enable (gboolean with_stun);
  */
 void nice_debug_disable (gboolean with_stun);
 
+/**
+ * nice_debug_set_from_string:
+ * @extra_string: String in the style of G_MESSAGES_DEBUG
+ *
+ * This parses the same kind of string that could be passed to the
+ * standard G_MESSAGES_DEBUG environment variable. It uses the categorie defined
+ * in the doc for the nice_debug_enable() function.
+ *
+ * Since: 0.1.15
+ */
+
+void nice_debug_set_from_string (const gchar *extra_string);
+
 G_END_DECLS
 
 #endif /* __LIBNICE_DEBUG_H__ */

docs/reference/libnice/libnice-sections.txt

@@ -126,6 +126,7 @@ nice_address_ip_version
 <TITLE>Debug messages</TITLE>
 nice_debug_enable
 nice_debug_disable
+nice_debug_set_from_string
 </SECTION>
 
 <SECTION>

nice/libnice.sym

@@ -64,6 +64,7 @@ nice_candidate_new
 nice_component_state_to_string
 nice_debug_disable
 nice_debug_enable
+nice_debug_set_from_string
 nice_interfaces_get_ip_for_interface
 nice_interfaces_get_local_interfaces
 nice_interfaces_get_local_ips