X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.h;h=2919957f6d286d55fc47b3557b4ab7c6798a1a38;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=ff2cb345c62a6def37250892ca135a386126d3b6;hpb=4b3fd94b1cc79c24c4092b6b10ed4627a2648d26;p=tinc

diff --git a/src/logger.h b/src/logger.h
index ff2cb345..2919957f 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -2,16 +2,16 @@
 #define __TINC_LOGGER_H__
 
 typedef enum debug_t {
-	DEBUG_NOTHING = 0,			/* Quiet mode, only show starting/stopping of the daemon */
+	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 */
-	DEBUG_ERROR = 2,			/* Show error messages received from other hosts */
-	DEBUG_STATUS = 2,			/* Show status messages received from other hosts */
-	DEBUG_PROTOCOL = 3,			/* Show the requests that are sent/received */
-	DEBUG_META = 4,				/* Show contents of every request that is sent/received */
-	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_CONNECTIONS = 1,          /* Show (dis)connects of other tinc daemons via TCP */
+	DEBUG_ERROR = 2,                /* Show error messages received from other hosts */
+	DEBUG_STATUS = 2,               /* Show status messages received from other hosts */
+	DEBUG_PROTOCOL = 3,             /* Show the requests that are sent/received */
+	DEBUG_META = 4,                 /* Show contents of every request that is sent/received */
+	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;
 
 typedef enum logmode_t {
@@ -46,11 +46,10 @@ enum {
 #endif
 
 extern debug_t debug_level;
+extern bool logcontrol;
 extern void openlogger(const char *, logmode_t);
 extern void reopenlogger(void);
-extern void logger(int, const char *, ...) __attribute__ ((__format__(printf, 2, 3)));
+extern void logger(int, int, const char *, ...) __attribute__ ((__format__(printf, 3, 4)));
 extern void closelogger(void);
 
-#define ifdebug(l) if(debug_level >= DEBUG_##l)
-
 #endif /* __TINC_LOGGER_H__ */