/*
logger.c -- logging code
- Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2004-2013 Guus Sliepen <guus@tinc-vpn.org>
2004-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
#include "conf.h"
#include "meta.h"
+#include "names.h"
#include "logger.h"
#include "connection.h"
-#include "control_common.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;
+
+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(level > debug_level || logmode == LOGMODE_NULL)
+ 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);
+ }
+#else
+#ifdef HAVE_SYSLOG_H
+ syslog(priority, "%s", message);
+#endif
+#endif
+ break;
+ case LOGMODE_NULL:
+ break;
+ }
+ }
+}
+
+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] = "";
+ int len = vsnprintf(message, sizeof message, format, ap);
+ if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+ message[len - 1] = 0;
+
+ 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();
case LOGMODE_NULL:
break;
}
+
+ if(logmode != LOGMODE_NULL)
+ sptps_log = sptps_logger;
+ else
+ sptps_log = sptps_log_quiet;
}
void reopenlogger() {
logfile = newfile;
}
-void logger(int level, int priority, const char *format, ...) {
- va_list ap;
- char timestr[32] = "";
- char message[1024] = "";
- time_t now;
- 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;
-
- va_start(ap, format);
- vsnprintf(message, sizeof message, format, ap);
- va_end(ap);
-
- if(level <= debug_level) {
- switch(logmode) {
- case LOGMODE_STDERR:
- fprintf(stderr, "%s\n", message);
- fflush(stderr);
- break;
- case LOGMODE_FILE:
- now = time(NULL);
- strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
- 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);
- }
-#else
-#ifdef HAVE_SYSLOG_H
- syslog(priority, "%s", message);
-#endif
-#endif
- break;
- case LOGMODE_NULL:
- break;
- }
- }
-
- if(logcontrol) {
- suppress = true;
- logcontrol = false;
- for(splay_node_t *node = connection_tree->head; node; node = node->next) {
- connection_t *c = node->data;
- if(!c->status.log)
- continue;
- logcontrol = true;
- if(level > (c->outcompression >= 0 ? c->outcompression : debug_level))
- continue;
- int len = strlen(message);
- if(send_request(c, "%d %d %d", CONTROL, REQ_LOG, len))
- send_meta(c, message, len);
- }
- suppress = false;
- }
-}
void closelogger(void) {
switch(logmode) {