X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=026a120260e8de51a3d9bb6a100151617e2fca4d;hb=668750c022a02cc54756316907f1cbbf7d673025;hp=6fb972d136149674779661ba4b28fbacf2d328ac;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc diff --git a/src/logger.c b/src/logger.c index 6fb972d1..026a1202 100644 --- a/src/logger.c +++ b/src/logger.c @@ -1,6 +1,6 @@ /* logger.c -- logging code - Copyright (C) 2004-2012 Guus Sliepen + Copyright (C) 2004-2022 Guus Sliepen 2004-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -26,99 +26,152 @@ #include "logger.h" #include "connection.h" #include "control_common.h" +#include "process.h" #include "sptps.h" +#include "compression.h" 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; +bool logcontrol = false; // controlled by REQ_LOG +int umbilical = 0; +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; - // Bail out early if there is nothing to do. - if(suppress) - return; - - if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL)) + if(suppress) { return; + } if(level <= debug_level) { switch(logmode) { - case LOGMODE_STDERR: - fprintf(stderr, "%s\n", message); - fflush(stderr); - break; - case LOGMODE_FILE: - if(!now.tv_sec) - gettimeofday(&now, NULL); - time_t now_sec = now.tv_sec; - strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now_sec)); - fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message); - fflush(logfile); - break; - case LOGMODE_SYSLOG: -#ifdef HAVE_MINGW - { - const char *messages[] = {message}; - ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL); - } + case LOGMODE_STDERR: + fprintf(stderr, "%s\n", message); + fflush(stderr); + break; + + case LOGMODE_FILE: + if(!now.tv_sec) { + gettimeofday(&now, NULL); + } + + time_t now_sec = now.tv_sec; + strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", localtime(&now_sec)); + fprintf(logfile, "%s %s[%ld]: %s\n", timestr, logident, (long)logpid, message); + fflush(logfile); + break; + + case LOGMODE_SYSLOG: +#ifdef HAVE_WINDOWS + { + const char *messages[] = {message}; + ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL); + } + #else #ifdef HAVE_SYSLOG_H - syslog(priority, "%s", message); + syslog(priority, "%s", message); #endif #endif - break; - case LOGMODE_NULL: - break; + break; + + case LOGMODE_NULL: + default: + break; + } + + if(umbilical && do_detach) { + 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. + } } } if(logcontrol) { suppress = true; logcontrol = false; - for list_each(connection_t, c, connection_list) { - if(!c->status.log) + + 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); - if(send_request(c, "%d %d %d", CONTROL, REQ_LOG, len)) + } + + size_t len = strlen(message); + + if(send_request(c, "%d %d %lu", CONTROL, REQ_LOG, (unsigned long)len)) { send_meta(c, message, len); + } } + suppress = false; } } -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); + int len = vsnprintf(message, sizeof(message), format, ap); + message[sizeof(message) - 1] = 0; va_end(ap); - if(len > 0 && len < sizeof message && message[len - 1] == '\n') + if(len > 0 && (size_t)len < sizeof(message) - 1 && message[len - 1] == '\n') { message[len - 1] = 0; + } real_logger(level, priority, message); } static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) { - char message[1024] = ""; - int len = vsnprintf(message, sizeof message, format, ap); - if(len > 0 && len < sizeof message && message[len - 1] == '\n') - message[len - 1] = 0; + (void)s_errno; + char message[1024]; + size_t msglen = sizeof(message); + + if(!should_log(DEBUG_TRAFFIC)) { + return; + } + + int len = vsnprintf(message, msglen, format, ap); + message[sizeof(message) - 1] = 0; - real_logger(DEBUG_ALWAYS, LOG_ERR, message); + if(len > 0 && (size_t)len < sizeof(message) - 1) { + if(message[len - 1] == '\n') { + message[--len] = 0; + } + + // WARNING: s->handle can point to a connection_t or a node_t, + // but both types have the name and hostname fields at the same offsets. + connection_t *c = s->handle; + + if(c) { + snprintf(message + len, sizeof(message) - len, " from %s (%s)", c->name, c->hostname); + } + } + + real_logger(DEBUG_TRAFFIC, LOG_ERR, message); } void openlogger(const char *ident, logmode_t mode) { @@ -126,51 +179,63 @@ void openlogger(const char *ident, logmode_t mode) { logmode = mode; switch(mode) { - case LOGMODE_STDERR: - logpid = getpid(); - break; - case LOGMODE_FILE: - logpid = getpid(); - logfile = fopen(logfilename, "a"); - if(!logfile) { - fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno)); - logmode = LOGMODE_NULL; - } - break; - case LOGMODE_SYSLOG: -#ifdef HAVE_MINGW - loghandle = RegisterEventSource(NULL, logident); - if(!loghandle) { - fprintf(stderr, "Could not open log handle!"); - logmode = LOGMODE_NULL; - } - break; + case LOGMODE_STDERR: + logpid = getpid(); + break; + + case LOGMODE_FILE: + logpid = getpid(); + logfile = fopen(logfilename, "a"); + + if(!logfile) { + fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno)); + logmode = LOGMODE_NULL; + } + + break; + + case LOGMODE_SYSLOG: +#ifdef HAVE_WINDOWS + loghandle = RegisterEventSource(NULL, logident); + + if(!loghandle) { + fprintf(stderr, "Could not open log handle!\n"); + logmode = LOGMODE_NULL; + } + + break; #else #ifdef HAVE_SYSLOG_H - openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON); - break; + openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON); + break; #endif #endif - case LOGMODE_NULL: - break; + + case LOGMODE_NULL: + default: + break; } - if(logmode != LOGMODE_NULL) + if(logmode != LOGMODE_NULL) { sptps_log = sptps_logger; - else + } else { sptps_log = sptps_log_quiet; + } } -void reopenlogger() { - if(logmode != LOGMODE_FILE) +void reopenlogger(void) { + if(logmode != LOGMODE_FILE) { return; + } fflush(logfile); FILE *newfile = fopen(logfilename, "a"); + if(!newfile) { logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reopen log file %s: %s", logfilename, strerror(errno)); return; } + fclose(logfile); logfile = newfile; } @@ -178,22 +243,24 @@ void reopenlogger() { void closelogger(void) { switch(logmode) { - case LOGMODE_FILE: - fclose(logfile); - break; - case LOGMODE_SYSLOG: -#ifdef HAVE_MINGW - DeregisterEventSource(loghandle); - break; + case LOGMODE_FILE: + fclose(logfile); + break; + + case LOGMODE_SYSLOG: +#ifdef HAVE_WINDOWS + DeregisterEventSource(loghandle); + break; #else #ifdef HAVE_SYSLOG_H - closelog(); - break; + closelog(); + break; #endif #endif - case LOGMODE_NULL: - case LOGMODE_STDERR: - break; - break; + + case LOGMODE_NULL: + case LOGMODE_STDERR: + default: + break; } }