F-Ticks logging changes

[radsecproxy.git] / debug.c

diff --git a/debug.c b/debug.c
index b8c7ed1..79d0f9d 100644 (file)
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2010 NORDUnet A/S
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,6 +19,7 @@
 #include <sys/time.h>
 #include <syslog.h>
 #include <errno.h>
+#include <assert.h>
 #include "debug.h"
 #include "util.h"
 
@@ -26,7 +28,16 @@ static uint8_t debug_level = DBG_INFO;
 static char *debug_filepath = NULL;
 static FILE *debug_file = NULL;
 static int debug_syslogfacility = 0;
+#if defined(WANT_FTICKS)
+static int fticks_syslogfacility = 0;
+#endif
 static uint8_t debug_timestamp = 0;
+static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
+       "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
+       "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
+static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
+       LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
+       LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
 
 void debug_init(char *ident) {
     debug_file = stderr;
@@ -43,9 +54,12 @@ void debug_set_level(uint8_t level) {
        debug_level = DBG_WARN;
        return;
     case 3:
-       debug_level = DBG_INFO;
+       debug_level = DBG_NOTICE;
        return;
     case 4:
+       debug_level = DBG_INFO;
+       return;
+    case 5:
        debug_level = DBG_DBG;
        return;
     }
@@ -59,13 +73,34 @@ uint8_t debug_get_level() {
     return debug_level;
 }
 
+#if defined(WANT_FTICKS)
+int debug_set_ftickssyslogfacility(char *dest) {
+    int i;
+    if (!strncasecmp(dest, "x-syslog://", 11)) {
+       dest += 11;
+       if (*dest == '/')
+           dest++;
+    }
+    if (*dest) {
+       for (i = 0; facstrings[i]; i++)
+           if (!strcasecmp(dest, facstrings[i]))
+               break;
+        if (!facstrings[i]) {
+           debug(DBG_ERR, "Unknown syslog facility %s for F-Ticks, assuming default", dest);
+           fticks_syslogfacility = 0;
+       } else
+           fticks_syslogfacility = facvals[i];
+    } else {
+       fticks_syslogfacility = 0;
+    }
+    if (fticks_syslogfacility && !debug_syslogfacility) {
+       openlog(debug_ident, LOG_PID, fticks_syslogfacility);
+    }  
+    return 1;
+}
+#endif
+
 int debug_set_destination(char *dest) {
-    static const char *facstrings[] = { "LOG_DAEMON", "LOG_MAIL", "LOG_USER", "LOG_LOCAL0",
-                                       "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4",
-                                       "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", NULL };
-    static const int facvals[] = { LOG_DAEMON, LOG_MAIL, LOG_USER, LOG_LOCAL0,
-                                  LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4,
-                                  LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
     extern int errno;
     int i;
 
@@ -136,6 +171,9 @@ void debug_logit(uint8_t level, const char *format, va_list ap) {
        case DBG_INFO:
            priority = LOG_INFO;
            break;
+       case DBG_NOTICE:
+           priority = LOG_NOTICE;
+           break;
        case DBG_WARN:
            priority = LOG_WARNING;
            break;
@@ -178,6 +216,51 @@ void debugx(int status, uint8_t level, char *format, ...) {
     exit(status);
 }
 
+void debugerrno(int err, uint8_t level, char *format, ...) {
+    if (level >= debug_level) {
+       va_list ap;
+       size_t len = strlen(format);
+       char *tmp = malloc(len + 1024 + 2);
+       assert(tmp);
+       strcpy(tmp, format);
+       tmp[len++] = ':';
+       tmp[len++] = ' ';
+       if (strerror_r(err, tmp + len, 1024))
+           tmp = format;
+       va_start(ap, format);
+       debug_logit(level, tmp, ap);
+       va_end(ap);
+    }
+}
+
+void debugerrnox(int err, uint8_t level, char *format, ...) {
+    if (level >= debug_level) {
+       va_list ap;
+       va_start(ap, format);
+       debugerrno(err, level, format, ap);
+       va_end(ap);
+    }
+    exit(err);
+}
+
+#if defined(WANT_FTICKS)
+void fticks_debug(const char *format, ...) {
+    int priority;
+    va_list ap;
+    va_start(ap, format);
+    if (!debug_syslogfacility && !fticks_syslogfacility)
+       debug_logit(0xff, format, ap);
+    else {
+       if (fticks_syslogfacility) {
+           priority = LOG_DEBUG|fticks_syslogfacility;
+       } else {
+           priority = LOG_DEBUG;
+       }
+       vsyslog(priority, format, ap);
+       va_end(ap);
+    }
+}
+#endif
 /* Local Variables: */
 /* c-file-style: "stroustrup" */
 /* End: */