X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.h;h=52f8283da95a05dd5c44d9ba1e3c5f5375e76915;hb=48dd371b2ec69f02870aa5e2a67fc8adb4617ff1;hp=252497bf984376d8a046d5769cab2f256cde5ab5;hpb=11868b890d1a7f4cfbfb37099393b32019010f66;p=tinc

diff --git a/src/logger.h b/src/logger.h
index 252497bf..52f8283d 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -1,7 +1,10 @@
+#ifndef TINC_LOGGER_H
+#define TINC_LOGGER_H
+
 /*
     logger.h -- header file for logger.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -18,10 +21,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_LOGGER_H__
-#define __TINC_LOGGER_H__
+#include "system.h"
 
 typedef enum debug_t {
+	DEBUG_UNSET = -1,               /* Used by tinc as the default debug level. */
 	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 */
@@ -41,7 +44,7 @@ typedef enum logmode_t {
 	LOGMODE_SYSLOG
 } logmode_t;
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 #define LOG_EMERG EVENTLOG_ERROR_TYPE
 #define LOG_ALERT EVENTLOG_ERROR_TYPE
 #define LOG_CRIT EVENTLOG_ERROR_TYPE
@@ -70,9 +73,10 @@ enum {
 extern debug_t debug_level;
 extern bool logcontrol;
 extern int umbilical;
-extern void openlogger(const char *, logmode_t);
+extern bool umbilical_colorize;
+extern void openlogger(const char *ident, logmode_t mode);
 extern void reopenlogger(void);
-extern void logger(int, int, const char *, ...) __attribute__ ((__format__(printf, 3, 4)));
+extern void logger(debug_t level, int priority, const char *format, ...) ATTR_FORMAT(printf, 3, 4);
 extern void closelogger(void);
 
-#endif /* __TINC_LOGGER_H__ */
+#endif