X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.c;h=02f3f0f8c14aac3ff35dd441babf9f3ea543efed;hp=012f19d0f0eecf27e2d60d33dd1c56b33cf06fe2;hb=46cfe6199449a86eb58abaeac45b4021ffa7e178;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/logger.c b/src/logger.c
index 012f19d0..02f3f0f8 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,27 +17,25 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: logger.c,v 1.1.2.3 2003/07/12 17:41:45 guus Exp $
+    $Id: logger.c,v 1.1.2.11 2003/08/17 12:04:35 guus Exp $
 */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "system.h"
 
 #include "conf.h"
 #include "logger.h"
 
-#include "system.h"
-
-int debug_level = DEBUG_NOTHING;
-static int logmode = LOGMODE_STDERR;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 extern char *logfilename;
 static FILE *logfile = NULL;
+#ifdef HAVE_MINGW
+static HANDLE loghandle = NULL;
+#endif
 static const char *logident = NULL;
 
-void openlogger(const char *ident, int mode) {
+void openlogger(const char *ident, logmode_t mode) {
 	logident = ident;
 	logmode = mode;
 	
@@ -52,8 +50,19 @@ void openlogger(const char *ident, int mode) {
 				logmode = LOGMODE_NULL;
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+			loghandle = RegisterEventSource(NULL, logident);
+			if(!loghandle)
+				logmode = LOGMODE_NULL;
+			break;
+#else
+#ifdef HAVE_SYSLOG_H
 			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
 			break;
+#endif
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
 }
 
@@ -66,13 +75,24 @@ void logger(int priority, const char *format, ...) {
 		case LOGMODE_STDERR:
 			vfprintf(stderr, format, ap);
 			fprintf(stderr, "\n");
+			fflush(stderr);
 			break;
 		case LOGMODE_FILE:
 			fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
+			fflush(logfile);
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+			{
+				char message[4096];
+				char *messages[] = {message};
+				vsnprintf(message, sizeof(message), format, ap);
+				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+			}
+#else
+#ifdef HAVE_SYSLOG_H
 #ifdef HAVE_VSYSLOG
 			vsyslog(priority, format, ap);
 #else
@@ -83,6 +103,10 @@ void logger(int priority, const char *format, ...) {
 			}
 #endif
 			break;
+#endif
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
 
 	va_end(ap);
@@ -94,7 +118,18 @@ void closelogger(void) {
 			fclose(logfile);
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+			DeregisterEventSource(loghandle);
+			break;
+#else
+#ifdef HAVE_SYSLOG_H
 			closelog();
 			break;
+#endif
+#endif
+		case LOGMODE_NULL:
+		case LOGMODE_STDERR:
+			break;
+			break;
 	}
 }