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

diff --git a/src/logger.c b/src/logger.c
index 7fb16297..9c02a3d8 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:
@@ -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;
 		}
@@ -186,7 +194,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;
 		}