Changeset 4622

Timestamp:

11/11/08 11:52:37 (2 months ago)

Author:

martin

Message:

dynamic logging configuration through strongswan.conf
fallback to existing ipsec.conf/stroke loglevel configuration

Files:

• trunk/src/charon/bus/bus.c (modified) (1 diff)
• trunk/src/charon/bus/bus.h (modified) (1 diff)
• trunk/src/charon/bus/listeners/file_logger.c (modified) (1 diff)
• trunk/src/charon/daemon.c (modified) (4 diffs)
• trunk/src/charon/daemon.h (modified) (2 diffs)
• trunk/src/charon/plugins/stroke/stroke_socket.c (modified) (2 diffs)

trunk/src/charon/bus/bus.c

@@ -37 +37 @@
-);
-
+ENUM(debug_lower_names, DBG_DMN, DBG_LIB,
+    "dmn",
+    "mgr",
+    "ike",
+    "chd",
+    "job",
+    "cfg",
+    "knl",
+    "net",
+    "enc",
+    "lib",
+);
+
-typedef struct private_bus_t private_bus_t;
-

trunk/src/charon/bus/bus.h

@@ -71 +71 @@
-
-/**
+ * short names of debug message group, lower case.
+ */
+extern enum_name_t *debug_lower_names;
+
+/**
- * Debug levels used to control output verbosity.
- */

trunk/src/charon/bus/listeners/file_logger.c

@@ -99 +99 @@
-static void destroy(private_file_logger_t *this)
-{
+    if (this->out != stdout && this->out != stderr)
+    {
+        fclose(this->out);
+    }
-    free(this);
-}

trunk/src/charon/daemon.c

@@ -206 +206 @@
-    dbg = dbg_stderr;
-    DESTROY_IF(this->public.bus);
-
-
-
+
+
+
+
-    free(this);
-}
@@ -329 +330 @@
-
-/**
+ * Initialize logging
+ */
+static void initialize_loggers(private_daemon_t *this, bool use_stderr,
+                               level_t levels[])
+{
+    sys_logger_t *sys_logger;
+    file_logger_t *file_logger;
+    enumerator_t *enumerator;
+    char *facility, *filename;
+    int loggers_defined = 0;
+    debug_t group;
+    level_t  def;
+    bool append;
+    FILE *file;
+    
+    /* setup sysloggers */
+    enumerator = lib->settings->create_section_enumerator(lib->settings,
+                                                          "charon.syslog");
+    while (enumerator->enumerate(enumerator, &facility))
+    {
+        loggers_defined++;
+        if (streq(facility, "daemon"))
+        {
+            sys_logger = sys_logger_create(LOG_DAEMON);
+        }
+        else if (streq(facility, "auth"))
+        {
+            sys_logger = sys_logger_create(LOG_AUTHPRIV);
+        }
+        else
+        {
+            continue;
+        }
+        def = lib->settings->get_int(lib->settings,
+                                     "charon.syslog.%s.default", 1, facility);
+        for (group = 0; group < DBG_MAX; group++)
+        {
+            sys_logger->set_level(sys_logger, group,
+                lib->settings->get_int(lib->settings,
+                                       "charon.syslog.%s.%N", def,
+                                       facility, debug_lower_names, group));
+        }
+        this->public.sys_loggers->insert_last(this->public.sys_loggers,
+                                              sys_logger);
+        this->public.bus->add_listener(this->public.bus, &sys_logger->listener);
+    }
+    enumerator->destroy(enumerator);
+    
+    /* and file loggers */
+    enumerator = lib->settings->create_section_enumerator(lib->settings,
+                                                          "charon.filelog");
+    while (enumerator->enumerate(enumerator, &filename))
+    {
+        loggers_defined++;
+        if (streq(filename, "stderr"))
+        {
+            file = stderr;
+        }
+        else if (streq(filename, "stdout"))
+        {
+            file = stdout;
+        }
+        else
+        {
+            append = lib->settings->get_bool(lib->settings,
+                                    "charon.filelog.%s.append", TRUE, filename);
+            file = fopen(filename, append ? "a" : "w");
+            if (file == NULL)
+            {
+                DBG1(DBG_DMN, "opening file %s for logging failed: %s",
+                     filename, strerror(errno));
+                continue;
+            }
+        }
+        file_logger = file_logger_create(file);
+        def = lib->settings->get_int(lib->settings,
+                                     "charon.filelog.%s.default", 1, filename);
+        for (group = 0; group < DBG_MAX; group++)
+        {
+            file_logger->set_level(file_logger, group,
+                lib->settings->get_int(lib->settings,
+                                       "charon.filelog.%s.%N", def,
+                                       filename, debug_lower_names, group));
+        }
+        this->public.file_loggers->insert_last(this->public.file_loggers,
+                                               file_logger);
+        this->public.bus->add_listener(this->public.bus, &file_logger->listener);
+    
+    }
+    enumerator->destroy(enumerator);
+    
+    /* setup legacy style default loggers provided via command-line */
+    if (!loggers_defined)
+    {
+        file_logger = file_logger_create(stdout);
+        sys_logger = sys_logger_create(LOG_DAEMON);
+        this->public.bus->add_listener(this->public.bus, &file_logger->listener);
+        this->public.bus->add_listener(this->public.bus, &sys_logger->listener);
+        this->public.file_loggers->insert_last(this->public.file_loggers,
+                                               file_logger);
+        this->public.sys_loggers->insert_last(this->public.sys_loggers,
+                                              sys_logger);
+        for (group = 0; group < DBG_MAX; group++)
+        {
+            sys_logger->set_level(sys_logger, group, levels[group]);
+            if (use_stderr)
+            {
+                file_logger->set_level(file_logger, group, levels[group]);
+            }
+        }
+    }
+}
+
+/**
- * Initialize the daemon
- */
-static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
-{
-    debug_t group;
-    
-    /* for uncritical pseudo random numbers */
-    srandom(time(NULL) + getpid());
@@ -340 +453 @@
-    /* setup bus and it's listeners first to enable log output */
-    this->public.bus = bus_create();
-    this->public.outlog = file_logger_create(stdout);
-    this->public.syslog = sys_logger_create(LOG_DAEMON);
-    this->public.authlog = sys_logger_create(LOG_AUTHPRIV);
-    this->public.bus->add_listener(this->public.bus, &this->public.syslog->listener);
-    this->public.bus->add_listener(this->public.bus, &this->public.outlog->listener);
-    this->public.bus->add_listener(this->public.bus, &this->public.authlog->listener);
-    this->public.authlog->set_level(this->public.authlog, DBG_ANY, LEVEL_AUDIT);
-    /* set up hook to log dbg message in library via charons message bus */
-    dbg = dbg_bus;
-    
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    DBG1(DBG_DMN, "starting charon (strongSwan Version %s)", VERSION);
@@ -465 +561 @@
-    this->public.sim = NULL;
-    this->public.bus = NULL;
-
-
-
+
+
-#ifdef ME
-    this->public.connect_manager = NULL;

trunk/src/charon/daemon.h

@@ -218 +218 @@
-    
-    /**
-
+for 
-     */
-    attribute_manager_t *attributes;
@@ -253 +253 @@
-    
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    
-    /**

trunk/src/charon/plugins/stroke/stroke_socket.c

@@ -359 +359 @@
-                            stroke_msg_t *msg, FILE *out)
-{
+    enumerator_t *enumerator;
+    sys_logger_t *sys_logger;
+    file_logger_t *file_logger;
-    debug_t group;
-    
@@ -371 +374 @@
-        return;
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-