debug: Add ability to dump_data per debug class

Signed-off-by: Kai Blin <kai@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/debug.h b/lib/util/debug.h
index feea0a8d94e98c7d1cdc8396317a1928f8bca71e..30df78732ac3ace902613cf20ebe895d142f65d6 100644 (file)
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -161,10 +161,17 @@ extern int  *DEBUGLEVEL_CLASS;
   ( ((level) <= MAX_DEBUG_LEVEL) && \
     unlikely(DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level)))
 
+#define CHECK_DEBUGLVLC( dbgc_class, level ) \
+  ( ((level) <= MAX_DEBUG_LEVEL) && \
+    unlikely(DEBUGLEVEL_CLASS[ dbgc_class ] >= (level)))
+
 #define DEBUGLVL( level ) \
   ( CHECK_DEBUGLVL(level) \
    && dbghdrclass( level, DBGC_CLASS, __location__, __FUNCTION__ ) )
 
+#define DEBUGLVLC( dbgc_class, level ) \
+  ( CHECK_DEBUGLVLC( dbgc_class, level ) \
+   && dbghdrclass( level, dbgc_class, __location__, __FUNCTION__ ) )
 
 #define DEBUG( level, body ) \
   (void)( ((level) <= MAX_DEBUG_LEVEL) && \

diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 6a4373e4247ade5e3d115ff7328f401460f735f2..89aa9aa7d8e5ae1a36ebea8f980de7f2fbefc096 100644 (file)
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -690,6 +690,14 @@ void dump_data_file(const uint8_t *buf, int len, bool omit_zero_bytes,
  */
 _PUBLIC_ void dump_data(int level, const uint8_t *buf,int len);
 
+/**
+ * Write dump of binary data to the log file.
+ *
+ * The data is only written if the log level is at least level for
+ * debug class dbgc_class.
+ */
+_PUBLIC_ void dump_data_dbgc(int dbgc_class, int level, const uint8_t *buf, int len);
+
 /**
  * Write dump of binary data to the log file.
  *

diff --git a/lib/util/util.c b/lib/util/util.c
index 7962c1e2ea8a4df3fcafd521b9dcf32722f41cfc..7c669fbd5eac7457f2cb197f27fed7c0bbce0c2d 100644 (file)
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -384,6 +384,19 @@ _PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type)
        return true;
 }
 
+struct debug_channel_level {
+       int channel;
+       int level;
+};
+
+static void debugadd_channel_cb(const char *buf, void *private_data)
+{
+       struct debug_channel_level *dcl =
+               (struct debug_channel_level *)private_data;
+
+       DEBUGADDC(dcl->channel, dcl->level,("%s", buf));
+}
+
 static void debugadd_cb(const char *buf, void *private_data)
 {
        int *plevel = (int *)private_data;
@@ -502,6 +515,23 @@ _PUBLIC_ void dump_data(int level, const uint8_t *buf, int len)
        dump_data_cb(buf, len, false, debugadd_cb, &level);
 }
 
+/**
+ * Write dump of binary data to the log file.
+ *
+ * The data is only written if the log level is at least level for
+ * debug class dbgc_class.
+ */
+_PUBLIC_ void dump_data_dbgc(int dbgc_class, int level, const uint8_t *buf, int len)
+{
+       struct debug_channel_level dcl = { dbgc_class, level };
+
+       if (!DEBUGLVLC(dbgc_class, level)) {
+               DEBUG(0, ("dbgc_class is %d\n", dbgc_class));
+               return;
+       }
+       dump_data_cb(buf, len, false, debugadd_channel_cb, &dcl);
+}
+
 /**
  * Write dump of binary data to the log file.
  *