connection_t: split compression_level/log_level into two fields

[tinc] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index 9c02a3d..026a120 100644 (file)
--- 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,23 +28,24 @@
 #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;
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 static HANDLE loghandle = NULL;
 #endif
 static const char *logident = NULL;
 bool logcontrol = false; // controlled by REQ_LOG <level>
 int umbilical = 0;
 
-static bool should_log(int level) {
+static bool should_log(debug_t level) {
        return (level <= debug_level && logmode != LOGMODE_NULL) || logcontrol;
 }
 
-static void real_logger(int level, int priority, const char *message) {
+static void real_logger(debug_t level, int priority, const char *message) {
        char timestr[32] = "";
        static bool suppress = false;
 
@@ -71,7 +72,7 @@ static void real_logger(int level, int priority, const char *message) {
                        break;
 
                case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
                        {
                                const char *messages[] = {message};
                                ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
@@ -85,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.
+                       }
                }
        }
 
@@ -98,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->log_level != DEBUG_UNSET ? c->log_level : 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);
                        }
                }
@@ -120,7 +125,7 @@ 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] = "";
 
@@ -145,7 +150,7 @@ static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap
        char message[1024];
        size_t msglen = sizeof(message);
 
-       if(!should_log(DEBUG_ALWAYS)) {
+       if(!should_log(DEBUG_TRAFFIC)) {
                return;
        }
 
@@ -166,7 +171,7 @@ static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap
                }
        }
 
-       real_logger(DEBUG_ALWAYS, LOG_ERR, message);
+       real_logger(DEBUG_TRAFFIC, LOG_ERR, message);
 }
 
 void openlogger(const char *ident, logmode_t mode) {
@@ -190,7 +195,7 @@ void openlogger(const char *ident, logmode_t mode) {
                break;
 
        case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
                loghandle = RegisterEventSource(NULL, logident);
 
                if(!loghandle) {
@@ -207,6 +212,7 @@ void openlogger(const char *ident, logmode_t mode) {
 #endif
 
        case LOGMODE_NULL:
+       default:
                break;
        }
 
@@ -217,7 +223,7 @@ void openlogger(const char *ident, logmode_t mode) {
        }
 }
 
-void reopenlogger() {
+void reopenlogger(void) {
        if(logmode != LOGMODE_FILE) {
                return;
        }
@@ -242,7 +248,7 @@ void closelogger(void) {
                break;
 
        case LOGMODE_SYSLOG:
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
                DeregisterEventSource(loghandle);
                break;
 #else
@@ -254,6 +260,7 @@ void closelogger(void) {
 
        case LOGMODE_NULL:
        case LOGMODE_STDERR:
+       default:
                break;
        }
 }