X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=caaf038d3b350d679f0ad8b2a2652b2cff099aa9;hb=28b7a53b693f6b4e70218a926e68a36ece54cda1;hp=7fb16297ca7cc19b6fdfdee75475cd95ae046cf5;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/logger.c b/src/logger.c
index 7fb16297..caaf038d 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2017 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2022 Guus Sliepen <guus@tinc-vpn.org>
                   2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -28,8 +28,9 @@
 #include "control_common.h"
 #include "process.h"
 #include "sptps.h"
+#include "compression.h"
 
-int debug_level = DEBUG_NOTHING;
+debug_t debug_level = DEBUG_NOTHING;
 static logmode_t logmode = LOGMODE_STDERR;
 static pid_t logpid;
 static FILE *logfile = NULL;
@@ -37,22 +38,21 @@ static FILE *logfile = NULL;
 static HANDLE loghandle = NULL;
 #endif
 static const char *logident = NULL;
-bool logcontrol = false;
+bool logcontrol = false; // controlled by REQ_LOG <level>
 int umbilical = 0;
 
-static void real_logger(int level, int priority, const char *message) {
+static bool should_log(debug_t level) {
+	return (level <= debug_level && logmode != LOGMODE_NULL) || logcontrol;
+}
+
+static void real_logger(debug_t level, int priority, const char *message) {
 	char timestr[32] = "";
 	static bool suppress = false;
 
-	// Bail out early if there is nothing to do.
 	if(suppress) {
 		return;
 	}
 
-	if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL)) {
-		return;
-	}
-
 	if(level <= debug_level) {
 		switch(logmode) {
 		case LOGMODE_STDERR:
@@ -86,12 +86,16 @@ static void real_logger(int level, int priority, const char *message) {
 			break;
 
 		case LOGMODE_NULL:
+		default:
 			break;
 		}
 
 		if(umbilical && do_detach) {
-			write(umbilical, message, strlen(message));
-			write(umbilical, "\n", 1);
+			size_t len = strlen(message);
+
+			if(write(umbilical, message, len) != (ssize_t)len || write(umbilical, "\n", 1) != 1) {
+				// Other end broken, nothing we can do about it.
+			}
 		}
 	}
 
@@ -99,20 +103,20 @@ static void real_logger(int level, int priority, const char *message) {
 		suppress = true;
 		logcontrol = false;
 
-		for list_each(connection_t, c, connection_list) {
+		for list_each(connection_t, c, &connection_list) {
 			if(!c->status.log) {
 				continue;
 			}
 
 			logcontrol = true;
 
-			if(level > (c->outcompression >= 0 ? c->outcompression : debug_level)) {
+			if(level > (c->outcompression >= COMPRESS_NONE ? c->outcompression : debug_level)) {
 				continue;
 			}
 
-			int len = strlen(message);
+			size_t len = strlen(message);
 
-			if(send_request(c, "%d %d %d", CONTROL, REQ_LOG, len)) {
+			if(send_request(c, "%d %d %lu", CONTROL, REQ_LOG, (unsigned long)len)) {
 				send_meta(c, message, len);
 			}
 		}
@@ -121,16 +125,20 @@ static void real_logger(int level, int priority, const char *message) {
 	}
 }
 
-void logger(int level, int priority, const char *format, ...) {
+void logger(debug_t level, int priority, const char *format, ...) {
 	va_list ap;
 	char message[1024] = "";
 
+	if(!should_log(level)) {
+		return;
+	}
+
 	va_start(ap, format);
 	int len = vsnprintf(message, sizeof(message), format, ap);
 	message[sizeof(message) - 1] = 0;
 	va_end(ap);
 
-	if(len > 0 && len < sizeof(message) - 1 && message[len - 1] == '\n') {
+	if(len > 0 && (size_t)len < sizeof(message) - 1 && message[len - 1] == '\n') {
 		message[len - 1] = 0;
 	}
 
@@ -138,13 +146,18 @@ void logger(int level, int priority, const char *format, ...) {
 }
 
 static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
+	(void)s_errno;
 	char message[1024];
 	size_t msglen = sizeof(message);
 
+	if(!should_log(DEBUG_ALWAYS)) {
+		return;
+	}
+
 	int len = vsnprintf(message, msglen, format, ap);
 	message[sizeof(message) - 1] = 0;
 
-	if(len > 0 && len < sizeof(message) - 1) {
+	if(len > 0 && (size_t)len < sizeof(message) - 1) {
 		if(message[len - 1] == '\n') {
 			message[--len] = 0;
 		}
@@ -186,7 +199,7 @@ void openlogger(const char *ident, logmode_t mode) {
 		loghandle = RegisterEventSource(NULL, logident);
 
 		if(!loghandle) {
-			fprintf(stderr, "Could not open log handle!");
+			fprintf(stderr, "Could not open log handle!\n");
 			logmode = LOGMODE_NULL;
 		}
 
@@ -199,6 +212,7 @@ void openlogger(const char *ident, logmode_t mode) {
 #endif
 
 	case LOGMODE_NULL:
+	default:
 		break;
 	}
 
@@ -209,7 +223,7 @@ void openlogger(const char *ident, logmode_t mode) {
 	}
 }
 
-void reopenlogger() {
+void reopenlogger(void) {
 	if(logmode != LOGMODE_FILE) {
 		return;
 	}
@@ -246,6 +260,7 @@ void closelogger(void) {
 
 	case LOGMODE_NULL:
 	case LOGMODE_STDERR:
+	default:
 		break;
 	}
 }