X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=21e043156daa7b21a88781eb0411a7538cb50b86;hb=ed2dddd420c8718006008b68e29ee93c5a1c3a79;hp=bcadae11f8a2d7b4643a1f1fde0da83726e3e8b1;hpb=a6448291834ca7419553a807ee367c719c2956d0;p=tinc

diff --git a/src/logger.c b/src/logger.c
index bcadae11..21e04315 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -37,22 +37,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 bool should_log(int level) {
+	return (level <= debug_level && logmode != LOGMODE_NULL) || logcontrol;
+}
+
 static void real_logger(int 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:
@@ -95,7 +94,7 @@ static void real_logger(int level, int priority, const char *message) {
 		}
 	}
 
-	if(logcontrol) {
+	if(logcontrol && connection_list) {
 		suppress = true;
 		logcontrol = false;
 
@@ -125,12 +124,16 @@ void logger(int 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 +141,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;
 		}