X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=54eb3b6845e8a852f495cd4645661e8fb8488707;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=028cbaef804ba053e285dc4d37b7716ac2d87f51;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index 028cbaef..54eb3b68 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
-                  2004-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -24,98 +23,33 @@
 #include "meta.h"
 #include "logger.h"
 #include "connection.h"
-#include "control_common.h"
+#include "sptps.h"
 
 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;
-bool logcontrol = false;
 
-void openlogger(const char *ident, logmode_t mode) {
-	logident = ident;
-	logmode = mode;
-	
-	switch(mode) {
-		case LOGMODE_STDERR:
-			logpid = getpid();
-			break;
-		case LOGMODE_FILE:
-			logpid = getpid();
-			logfile = fopen(logfilename, "a");
-			if(!logfile) {
-				fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno));
-				logmode = LOGMODE_NULL;
-			}
-			break;
-		case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
-			loghandle = RegisterEventSource(NULL, logident);
-			if(!loghandle) {
-				fprintf(stderr, "Could not open log handle!");
-				logmode = LOGMODE_NULL;
-			}
-			break;
-#else
-#ifdef HAVE_SYSLOG_H
-			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
-			break;
-#endif
-#endif
-		case LOGMODE_NULL:
-			break;
-	}
-}
-
-void reopenlogger() {
-	if(logmode != LOGMODE_FILE)
-		return;
-
-	fflush(logfile);
-	FILE *newfile = fopen(logfilename, "a");
-	if(!newfile) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reopen log file %s: %s\n", logfilename, strerror(errno));
-		return;
-	}
-	fclose(logfile);
-	logfile = newfile;
-}
-
-void logger(int level, int priority, const char *format, ...) {
-	va_list ap;
+static void real_logger(int level, int priority, const char *message) {
 	char timestr[32] = "";
-	char message[1024] = "";
-	time_t now;
 	static bool suppress = false;
 
 	// Bail out early if there is nothing to do.
 	if(suppress)
 		return;
 
-	if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL))
+	if(level > debug_level || logmode == LOGMODE_NULL)
 		return;
 
-	va_start(ap, format);
-	vsnprintf(message, sizeof message, format, ap);
-	va_end(ap);
-
 	if(level <= debug_level) {
 		switch(logmode) {
 			case LOGMODE_STDERR:
 				fprintf(stderr, "%s\n", message);
 				fflush(stderr);
 				break;
-			case LOGMODE_FILE:
-				now = time(NULL);
-				strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
-				fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message);
-				fflush(logfile);
-				break;
 			case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
 				{
@@ -132,30 +66,65 @@ void logger(int level, int priority, const char *format, ...) {
 				break;
 		}
 	}
+}
 
-	if(logcontrol) {
-		suppress = true;
-		logcontrol = false;
-		for(splay_node_t *node = connection_tree->head; node; node = node->next) {
-			connection_t *c = node->data;
-			if(!c->status.log)
-				continue;
-			logcontrol = true;
-			if(level > (c->outcompression >= 0 ? c->outcompression : debug_level))
-				continue;
-			int len = strlen(message);
-			if(send_request(c, "%d %d %d", CONTROL, REQ_LOG, len))
-				send_meta(c, message, len);
-		}
-		suppress = false;
+void logger(int level, int priority, const char *format, ...) {
+	va_list ap;
+	char message[1024] = "";
+
+	va_start(ap, format);
+	int len = vsnprintf(message, sizeof message, format, ap);
+	va_end(ap);
+
+	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+		message[len - 1] = 0;
+
+	real_logger(level, priority, message);
+}
+
+static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
+	char message[1024] = "";
+	int len = vsnprintf(message, sizeof message, format, ap);
+	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+		message[len - 1] = 0;
+
+	real_logger(DEBUG_ALWAYS, LOG_ERR, message);
+}
+
+void openlogger(const char *ident, logmode_t mode) {
+	logident = ident;
+	logmode = mode;
+
+	switch(mode) {
+		case LOGMODE_STDERR:
+			logpid = getpid();
+			break;
+		case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+			loghandle = RegisterEventSource(NULL, logident);
+			if(!loghandle) {
+				fprintf(stderr, "Could not open log handle!");
+				logmode = LOGMODE_NULL;
+			}
+			break;
+#else
+#ifdef HAVE_SYSLOG_H
+			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
+			break;
+#endif
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
+
+	if(logmode != LOGMODE_NULL)
+		sptps_log = sptps_logger;
+	else
+		sptps_log = sptps_log_quiet;
 }
 
 void closelogger(void) {
 	switch(logmode) {
-		case LOGMODE_FILE:
-			fclose(logfile);
-			break;
 		case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
 			DeregisterEventSource(loghandle);