add tags to logging

log.c

@@ -1,14 +1,63 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "log.h"
+#include "util.h"
 
-void LOG(const char * tag, int num, const char * fmt, ...)
+static uint32_t LOGMASK = TAG_FILENO;
+
+void set_logging_mask(uint32_t mask)
 {
+    LOGMASK = mask;
+}
+struct logtag
+{
+    uint32_t tagn;
+    const char * tag;
+};
+
+struct logtag tagtable[] = {
+    {TAG_MC,"MC"},
+    {TAG_GA,"GA"},
+    {TAG_CP,"CP"},
+    {TAG_ERR,"ERR"},
+    {TAG_PARSE,"PARSE"},
+    {TAG_CTAP,"CTAP"},
+    {TAG_DUMP,"DUMP"},
+};
+
+void LOG(uint32_t tag, const char * filename, int num, const char * fmt, ...)
+{
+    int i;
+
+    if (((tag & 0x7fffffff) & LOGMASK) == 0)
+    {
+        return;
+    }
+    for (i = 0; i < sizeof(tagtable)/sizeof(struct logtag); i++)
+    {
+        if (tag & tagtable[i].tagn)
+        {
+            printf("[%s] ", tagtable[i].tag);
+            break;
+        }
+    }
 #ifdef ENABLE_FILE_LOGGING
-    printf("%s:%d: ", tag, num);
+    if (tag & TAG_FILENO)
+    {
+        printf("%s:%d: ", filename, num);
+    }
 #endif
     va_list args;
     va_start(args, fmt);
     vprintf(fmt, args);
     va_end(args);
 }
+
+void LOG_HEX(uint32_t tag, uint8_t * data, int length)
+{
+    if (((tag & 0x7fffffff) & LOGMASK) == 0)
+    {
+        return;
+    }
+    dump_hex(data,length);
+}