add udebug support

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index cb9fa1666ff17b154b41499bb4c27f065b6660a2..403dc125d5f039546617f84b155760b195fc100d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,23 +15,31 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <unistd.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <syslog.h>
 
+#include <udebug.h>
+
 #include "netifd.h"
 #include "ubus.h"
 #include "config.h"
 #include "system.h"
 #include "interface.h"
+#include "wireless.h"
+#include "proto.h"
+#include "extdev.h"
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
+const char *config_path = DEFAULT_CONFIG_PATH;
 const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 
 static struct list_head process_list = LIST_HEAD_INIT(process_list);
+static struct udebug ud;
+static struct udebug_buf udb;
+static bool udebug_enabled;
 
 #define DEFAULT_LOG_LEVEL L_NOTICE
 
@@ -54,12 +62,57 @@ static bool use_syslog = true;
 static void
 netifd_delete_process(struct netifd_process *proc)
 {
+       while (ustream_poll(&proc->log.stream));
        list_del(&proc->list);
        ustream_free(&proc->log.stream);
        close(proc->log.fd.fd);
 }
 
+static void
+netifd_udebug_vprintf(const char *format, va_list ap)
+{
+       if (!udebug_enabled)
+               return;
+
+       udebug_entry_init(&udb);
+       udebug_entry_vprintf(&udb, format, ap);
+       udebug_entry_add(&udb);
+}
+
+void netifd_udebug_printf(const char *format, ...)
+{
+       va_list ap;
+
+       va_start(ap, format);
+       netifd_udebug_vprintf(format, ap);
+       va_end(ap);
+}
+
+void netifd_udebug_set_enabled(bool val)
+{
+       static const struct udebug_buf_meta meta = {
+               .name = "netifd_log",
+               .format = UDEBUG_FORMAT_STRING,
+       };
+
+       if (udebug_enabled == val)
+               return;
+
+       udebug_enabled = val;
+       if (!val) {
+               udebug_buf_free(&udb);
+               udebug_free(&ud);
+               return;
+       }
+
+       udebug_init(&ud);
+       udebug_auto_connect(&ud, NULL);
+       udebug_buf_init(&udb, 1024, 64 * 1024);
+       udebug_buf_add(&ud, &udb, &meta);
+}
+
 void
+__attribute__((format(printf, 2, 0)))
 netifd_log_message(int priority, const char *format, ...)
 {
        va_list vl;
@@ -68,6 +121,7 @@ netifd_log_message(int priority, const char *format, ...)
                return;
 
        va_start(vl, format);
+       netifd_udebug_vprintf(format, vl);
        if (use_syslog)
                vsyslog(log_class[priority], format, vl);
        else
@@ -83,7 +137,7 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
        char *data;
        int len = 0;
 
-       proc = container_of(s, struct netifd_process, log);
+       proc = container_of(s, struct netifd_process, log.stream);
        log_prefix = proc->log_prefix;
        if (!log_prefix)
                log_prefix = "process";
@@ -111,7 +165,9 @@ netifd_process_log_read_cb(struct ustream *s, int bytes)
                        netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
                                log_prefix, proc->uloop.pid, data);
                        proc->log_overflow = true;
-               }
+               } else
+                       break;
+
                ustream_consume(s, len);
        } while (1);
 }
@@ -122,9 +178,9 @@ netifd_process_cb(struct uloop_process *proc, int ret)
        struct netifd_process *np;
        np = container_of(proc, struct netifd_process, uloop);
 
-       while (ustream_poll(&np->log.stream));
        netifd_delete_process(np);
-       return np->cb(np, ret);
+       np->cb(np, ret);
+       return;
 }
 
 int
@@ -142,6 +198,8 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                goto error;
 
        if (!pid) {
+               int i;
+
                if (env) {
                        while (*env) {
                                putenv(*env);
@@ -149,22 +207,24 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                        }
                }
                if (proc->dir_fd >= 0)
-                       fchdir(proc->dir_fd);
-
-               dup2(pfds[1], 0);
-               dup2(pfds[1], 1);
-               dup2(pfds[1], 2);
+                       if (fchdir(proc->dir_fd)) {}
 
                close(pfds[0]);
-               close(pfds[1]);
+
+               for (i = 0; i <= 2; i++) {
+                       if (pfds[1] == i)
+                               continue;
+
+                       dup2(pfds[1], i);
+               }
+
+               if (pfds[1] > 2)
+                       close(pfds[1]);
 
                execvp(argv[0], (char **) argv);
                exit(127);
        }
 
-       if (pid < 0)
-               goto error;
-
        close(pfds[1]);
        proc->uloop.cb = netifd_process_cb;
        proc->uloop.pid = pid;
@@ -200,22 +260,17 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
        execvp(global_argv[0], global_argv);
 }
 
-static void netifd_do_reload(struct uloop_timeout *timeout)
+int netifd_reload(void)
 {
-       config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
-void netifd_reload(void)
-{
-       main_timer.cb = netifd_do_reload;
-       uloop_timeout_set(&main_timer, 100);
+       return config_init_all();
 }
 
 void netifd_restart(void)
 {
-       main_timer.cb = netifd_do_restart;
+       static struct uloop_timeout main_timer = {
+               .cb = netifd_do_restart
+       };
+
        interface_set_down(NULL);
        uloop_timeout_set(&main_timer, 1000);
 }
@@ -227,11 +282,12 @@ static int usage(const char *progname)
                " -d <mask>:            Mask for debug messages\n"
                " -s <path>:            Path to the ubus socket\n"
                " -p <path>:            Path to netifd addons (default: %s)\n"
+               " -c <path>:            Path to UCI configuration\n"
                " -h <path>:            Path to the hotplug script\n"
+               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                " -r <path>:            Path to resolv.conf\n"
                " -l <level>:           Log output level (default: %d)\n"
                " -S:                   Use stderr instead of syslog for log messages\n"
-               "                       (default: "DEFAULT_HOTPLUG_PATH")\n"
                "\n", progname, main_path, DEFAULT_LOG_LEVEL);
 
        return 1;
@@ -276,7 +332,7 @@ int main(int argc, char **argv)
 
        global_argv = argv;
 
-       while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) {
+       while ((ch = getopt(argc, argv, "d:s:p:c:h:r:l:S")) != -1) {
                switch(ch) {
                case 'd':
                        debug_mask = strtoul(optarg, NULL, 0);
@@ -287,6 +343,9 @@ int main(int argc, char **argv)
                case 'p':
                        main_path = optarg;
                        break;
+               case 'c':
+                       config_path = optarg;
+                       break;
                case 'h':
                        hotplug_cmd_path = optarg;
                        break;
@@ -295,8 +354,8 @@ int main(int argc, char **argv)
                        break;
                case 'l':
                        log_level = atoi(optarg);
-                       if (log_level >= ARRAY_SIZE(log_class))
-                               log_level = ARRAY_SIZE(log_class) - 1;
+                       if (log_level >= (int)ARRAY_SIZE(log_class))
+                               log_level = (int)ARRAY_SIZE(log_class) - 1;
                        break;
 #ifndef DUMMY_MODE
                case 'S':
@@ -317,6 +376,10 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       proto_shell_init();
+       extdev_init();
+       wireless_init();
+
        if (system_init()) {
                fprintf(stderr, "Failed to initialize system control\n");
                return 1;