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 390023b..026a120 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -110,7 +110,7 @@ static void real_logger(debug_t level, int priority, const char *message) {
 
                        logcontrol = true;
 
-                       if(level > (c->outcompression >= COMPRESS_NONE ? c->outcompression : debug_level)) {
+                       if(level > (c->log_level != DEBUG_UNSET ? c->log_level : debug_level)) {
                                continue;
                        }
 
@@ -150,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;
        }
 
@@ -171,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) {