Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / logger.c

diff --git a/src/logger.c b/src/logger.c
index 4c0d2312939c43330e7e29a07a94e845fa5e5291..54eb3b6845e8a852f495cd4645661e8fb8488707 100644 (file)
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
-                  2004-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,85 +20,96 @@
 #include "system.h"
 
 #include "conf.h"
+#include "meta.h"
 #include "logger.h"
+#include "connection.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;
 
-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)
-                               logmode = LOGMODE_NULL;
-                       break;
-               case LOGMODE_SYSLOG:
+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_SYSLOG:
 #ifdef HAVE_MINGW
-                       loghandle = RegisterEventSource(NULL, logident);
-                       if(!loghandle)
-                               logmode = LOGMODE_NULL;
-                       break;
+                               {
+                                       const char *messages[] = {message};
+                                       ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+                               }
 #else
 #ifdef HAVE_SYSLOG_H
-                       openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
-                       break;
+                               syslog(priority, "%s", message);
 #endif
 #endif
-               case LOGMODE_NULL:
-                       break;
+                               break;
+                       case LOGMODE_NULL:
+                               break;
+               }
        }
 }
 
-void logger(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);
 
-       switch(logmode) {
+       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:
-                       vfprintf(stderr, format, ap);
-                       fprintf(stderr, "\n");
-                       fflush(stderr);
-                       break;
-               case LOGMODE_FILE:
-                       fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)logpid);
-                       vfprintf(logfile, format, ap);
-                       fprintf(logfile, "\n");
-                       fflush(logfile);
+                       logpid = getpid();
                        break;
                case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
-                       {
-                               char message[4096];
-                               const char *messages[] = {message};
-                               vsnprintf(message, sizeof message, format, ap);
-                               ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+                       loghandle = RegisterEventSource(NULL, logident);
+                       if(!loghandle) {
+                               fprintf(stderr, "Could not open log handle!");
+                               logmode = LOGMODE_NULL;
                        }
+                       break;
 #else
 #ifdef HAVE_SYSLOG_H
-#ifdef HAVE_VSYSLOG
-                       vsyslog(priority, format, ap);
-#else
-                       {
-                               char message[4096];
-                               vsnprintf(message, sizeof message, format, ap);
-                               syslog(priority, "%s", message);
-                       }
-#endif
+                       openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
                        break;
 #endif
 #endif
@@ -107,14 +117,14 @@ void logger(int priority, const char *format, ...) {
                        break;
        }
 
-       va_end(ap);
+       if(logmode != LOGMODE_NULL)
+               sptps_log = sptps_logger;
+       else
+               sptps_log = sptps_log_quiet;
 }
 
 void closelogger(void) {
        switch(logmode) {
-               case LOGMODE_FILE:
-                       fclose(logfile);
-                       break;
                case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
                        DeregisterEventSource(loghandle);