Disable RC4.

[tlsproxy/tlsproxy.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 9cd3da49874ca28be965df0ebec9c5cd6a790027..e3af295e4c42cbabadb8e023f6d99bfabe94e7d8 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1,7 +1,7 @@
 /*
  * Log related functions/defines.
  *
- * Copyright (C) 2011  Simon Ruderich
+ * Copyright (C) 2011-2014  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,8 @@
 #include "tlsproxy.h"
 #include "log.h"
 
-/* va_*() */
-#include <stdarg.h>
-/* pthread_*() */
 #include <pthread.h>
+#include <stdarg.h>
 
 
 void log_message(int level, const char *file, int line, const char *format, ...) {
@@ -35,21 +33,30 @@ void log_message(int level, const char *file, int line, const char *format, ...)
     }
 
     switch (level) {
-        case LOG_ERROR_LEVEL:   level_string = "ERROR"; break;
-        case LOG_WARNING_LEVEL: level_string = "WARN "; break;
-        case LOG_DEBUG_LEVEL:   level_string = "DEBUG"; break;
+        case LOG_ERROR_LEVEL:   level_string = "ERROR "; break;
+        case LOG_WARNING_LEVEL: level_string = " WARN "; break;
+        case LOG_DEBUG1_LEVEL:  level_string = "DEBUG1"; break;
+        case LOG_DEBUG2_LEVEL:  level_string = "DEBUG2"; break;
         default:                level_string = "UNKNOWN";
     }
 
-    va_start(ap, format);
-#ifdef DEBUG
-    fprintf(stdout, "%-12s:%-3d ", file, line);
-#else
+#ifndef DEBUG
+    /* Prevent warnings. */
     (void)file;
     (void)line;
 #endif
-    fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self());
-    vfprintf(stdout, format, ap);
-    fprintf(stdout, "\n");
+
+    /* Prevent another thread from interrupting the printfs(). */
+    flockfile(stderr);
+
+#ifdef DEBUG
+    fprintf(stderr, "%-12s:%-4d ", file, line);
+#endif
+    fprintf(stderr, "[%s] [%ld] ", level_string, (long)pthread_self());
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
     va_end(ap);
+    fprintf(stderr, "\n");
+
+    funlockfile(stderr);
 }