X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=70180f7c24249cb44fa795dc597a4dd53f5a3019;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=8fbd3448204d342ddd28427d9db1fdc979f3cf4f;hpb=11868b890d1a7f4cfbfb37099393b32019010f66;p=tinc

diff --git a/src/logger.c b/src/logger.c
index 8fbd3448..70180f7c 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2015 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2017 Guus Sliepen <guus@tinc-vpn.org>
                   2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,10 @@
 #include "logger.h"
 #include "connection.h"
 #include "control_common.h"
+#include "process.h"
 #include "sptps.h"
 
-debug_t debug_level = DEBUG_NOTHING;
+int debug_level = DEBUG_NOTHING;
 static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 static FILE *logfile = NULL;
@@ -60,7 +61,7 @@ static void real_logger(int level, int priority, const char *message) {
 				if(!now.tv_sec)
 					gettimeofday(&now, NULL);
 				time_t now_sec = now.tv_sec;
-				strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now_sec));
+				strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", localtime(&now_sec));
 				fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message);
 				fflush(logfile);
 				break;
@@ -80,7 +81,7 @@ static void real_logger(int level, int priority, const char *message) {
 				break;
 		}
 
-		if(umbilical) {
+		if(umbilical && do_detach) {
 			write(umbilical, message, strlen(message));
 			write(umbilical, "\n", 1);
 		}
@@ -108,27 +109,31 @@ void logger(int level, int priority, const char *format, ...) {
 	char message[1024] = "";
 
 	va_start(ap, format);
-	int len = vsnprintf(message, sizeof message, format, ap);
+	int len = vsnprintf(message, sizeof(message), format, ap);
+	message[sizeof(message) - 1] = 0;
 	va_end(ap);
 
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+	if(len > 0 && len < sizeof(message) - 1 && 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] = "";
-	size_t msglen = sizeof message;
+	char message[1024];
+	size_t msglen = sizeof(message);
 
 	int len = vsnprintf(message, msglen, format, ap);
-	if(len > 0 && len < sizeof message) {
+	message[sizeof(message) - 1] = 0;
+	if(len > 0 && len < sizeof(message) - 1) {
 		if(message[len - 1] == '\n')
 			message[--len] = 0;
 
+		// WARNING: s->handle can point to a connection_t or a node_t,
+		// but both types have the name and hostname fields at the same offsets.
 		connection_t *c = s->handle;
 		if(c)
-			snprintf(message + len, sizeof message - len, " from %s (%s)", c->name, c->hostname);
+			snprintf(message + len, sizeof(message) - len, " from %s (%s)", c->name, c->hostname);
 	}
 
 	real_logger(DEBUG_ALWAYS, LOG_ERR, message);
@@ -207,6 +212,5 @@ void closelogger(void) {
 		case LOGMODE_NULL:
 		case LOGMODE_STDERR:
 			break;
-			break;
 	}
 }