X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.c;h=e46d926f42dac76dd98f3a21774da44cc6a4463b;hp=56bee84566fafd1afbd9d2d1570e5ed34b8897a1;hb=b22b9d438970a0442559949da35be9cc0ffaec00;hpb=e9de08be0dab58a48f9a8ce3d250516cf05d6b8e diff --git a/src/logger.c b/src/logger.c index 56bee845..e46d926f 100644 --- a/src/logger.c +++ b/src/logger.c @@ -1,6 +1,6 @@ /* logger.c -- logging code - Copyright (C) 2004-2006 Guus Sliepen + Copyright (C) 2004-2015 Guus Sliepen 2004-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -22,76 +22,26 @@ #include "conf.h" #include "meta.h" +#include "names.h" #include "logger.h" #include "connection.h" #include "control_common.h" +#include "process.h" +#include "sptps.h" debug_t debug_level = DEBUG_NOTHING; static logmode_t logmode = LOGMODE_STDERR; static pid_t logpid; -extern char *logfilename; static FILE *logfile = NULL; #ifdef HAVE_MINGW static HANDLE loghandle = NULL; #endif static const char *logident = NULL; bool logcontrol = false; +int umbilical = 0; -void openlogger(const char *ident, logmode_t mode) { - logident = ident; - 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; -#else -#ifdef HAVE_SYSLOG_H - openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON); - break; -#endif -#endif - case LOGMODE_NULL: - break; - } -} - -void reopenlogger() { - 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; -} - -void logger(int level, int priority, const char *format, ...) { - va_list ap; - int len; +static void real_logger(int level, int priority, const char *message) { char timestr[32] = ""; - char message[1024] = ""; - time_t now; static bool suppress = false; // Bail out early if there is nothing to do. @@ -101,13 +51,6 @@ void logger(int level, int priority, const char *format, ...) { if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL)) return; - va_start(ap, format); - len = vsnprintf(message, sizeof message, format, ap); - va_end(ap); - - if(len > 0 && len < sizeof message && message[len - 1] == '\n') - message[len - 1] = 0; - if(level <= debug_level) { switch(logmode) { case LOGMODE_STDERR: @@ -115,8 +58,10 @@ void logger(int level, int priority, const char *format, ...) { fflush(stderr); break; case LOGMODE_FILE: - now = time(NULL); - strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now)); + 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; @@ -135,13 +80,17 @@ void logger(int level, int priority, const char *format, ...) { case LOGMODE_NULL: break; } + + if(umbilical && do_detach) { + write(umbilical, message, strlen(message)); + write(umbilical, "\n", 1); + } } if(logcontrol) { suppress = true; logcontrol = false; - for(splay_node_t *node = connection_tree->head; node; node = node->next) { - connection_t *c = node->data; + for list_each(connection_t, c, connection_list) { if(!c->status.log) continue; logcontrol = true; @@ -155,6 +104,94 @@ void logger(int level, int priority, const char *format, ...) { } } +void logger(int level, int priority, const char *format, ...) { + va_list ap; + char message[1024] = ""; + + va_start(ap, format); + int len = vsnprintf(message, sizeof message, format, ap); + va_end(ap); + + if(len > 0 && len < sizeof message && 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] = ""; + size_t msglen = sizeof message; + + int len = vsnprintf(message, msglen, format, ap); + if(len > 0 && len < sizeof message) { + 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_ALWAYS, LOG_ERR, message); +} + +void openlogger(const char *ident, logmode_t mode) { + logident = ident; + 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; +#else +#ifdef HAVE_SYSLOG_H + openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON); + break; +#endif +#endif + case LOGMODE_NULL: + break; + } + + if(logmode != LOGMODE_NULL) + sptps_log = sptps_logger; + else + sptps_log = sptps_log_quiet; +} + +void reopenlogger() { + 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; +} + + void closelogger(void) { switch(logmode) { case LOGMODE_FILE: @@ -173,6 +210,5 @@ void closelogger(void) { case LOGMODE_NULL: case LOGMODE_STDERR: break; - break; } }