X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=effcb7887b883f6259eddf4e72ef3161aa2e1e70;hb=636200d1a2024982fe5b3062153daa72a8253015;hp=f85bd152d23301a0ad7440a541824c1d67b76d9b;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219;p=tinc

diff --git a/src/logger.c b/src/logger.c
index f85bd152..effcb788 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,7 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2003 Guus Sliepen <guus@sliepen.eu.org>
-                  2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2004-2005 Ivo Timmermans
 
     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
@@ -17,7 +17,7 @@
     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.8 2003/07/29 22:59:00 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -30,6 +30,9 @@ 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, logmode_t mode) {
@@ -47,9 +50,16 @@ void openlogger(const char *ident, logmode_t 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;
@@ -68,22 +78,32 @@ void logger(int priority, const char *format, ...) {
 			fflush(stderr);
 			break;
 		case LOGMODE_FILE:
-			fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
+			fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)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
 			{
 				char message[4096];
-				vsnprintf(message, sizeof(message), format, ap);
+				vsnprintf(message, sizeof message, format, ap);
 				syslog(priority, "%s", message);
 			}
 #endif
 			break;
+#endif
 #endif
 		case LOGMODE_NULL:
 			break;
@@ -98,9 +118,14 @@ 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: