X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.h;h=da849c40ab3a3f75e6410cae0c20eb2753cfbfd5;hp=ec5f52f0342736999e510031a95888daa5a811fe;hb=714fb32d0377ed9f5643ed8f0bd914843d12266b;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/src/logger.h b/src/logger.h
index ec5f52f0..da849c40 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,9 +1,6 @@
 #ifndef __TINC_LOGGER_H__
 
-#include <syslog.h>
-#include <stdarg.h>
-
-enum {
+typedef enum debug_t {
 	DEBUG_NOTHING = 0,			/* Quiet mode, only show starting/stopping of the daemon */
 	DEBUG_ALWAYS = 0,
 	DEBUG_CONNECTIONS = 1,		/* Show (dis)connects of other tinc daemons via TCP */
@@ -14,30 +11,33 @@ enum {
 	DEBUG_TRAFFIC = 5,			/* Show network traffic information */
 	DEBUG_PACKET = 6,			/* Show contents of each packet that is being sent/received */
 	DEBUG_SCARY_THINGS = 10		/* You have been warned */
-};
+} debug_t;
 
-enum {
+typedef enum logmode_t {
 	LOGMODE_NULL,
 	LOGMODE_STDERR,
 	LOGMODE_FILE,
 	LOGMODE_SYSLOG
+} logmode_t;
+
+#ifndef HAVE_SYSLOG_H
+enum {
+	LOG_EMERG,
+	LOG_ALERT,
+	LOG_CRIT,
+	LOG_ERR,
+	LOG_WARNING,
+	LOG_NOTICE,
+	LOG_INFO,
+	LOG_DEBUG,
 };
+#endif
 
-extern volatile int debug_level;
-extern void openlogger(const char *, int);
-extern void vlogger(int, const char *, va_list ap);
+extern debug_t debug_level;
+extern void openlogger(const char *, logmode_t);
+extern void logger(int, const char *, ...) __attribute__ ((format(printf, 2, 3)));
 extern void closelogger(void);
 
-/* Inline logger function because it's used quite often */
-
-static inline void logger(int level, int priority, const char *format, ...) {
-	va_list ap;
-
-	if(level == DEBUG_ALWAYS || debug_level >= level) {
-		va_start(ap, format);
-		vlogger(priority, format, ap);
-		va_end(ap);
-	}
-}
+#define ifdebug(l) if(debug_level >= DEBUG_##l)
 
 #endif /* __TINC_LOGGER_H__ */