CMake: bump the minimum required CMake version to 3.5

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index d8cb17f40658f8c7a6b777270a0eb08c4c239df9..375c6ab7873d075d4a6aa6f7eea15bed9fc6ef4d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,13 +24,43 @@
 #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_log;
+struct udebug_buf udb_nl;
+static const struct udebug_buf_meta meta_log = {
+       .name = "netifd_log",
+       .format = UDEBUG_FORMAT_STRING,
+};
+static const struct udebug_buf_meta meta_nl = {
+       .name = "netifd_nl",
+       .format = UDEBUG_FORMAT_PACKET,
+       .sub_format = UDEBUG_DLT_NETLINK,
+};
+static struct udebug_ubus_ring rings[] = {
+       {
+               .buf = &udb_log,
+               .meta = &meta_log,
+               .default_entries = 1024,
+               .default_size = 64 * 1024,
+       },
+       {
+               .buf = &udb_nl,
+               .meta = &meta_nl,
+               .default_entries = 1024,
+               .default_size = 64 * 1024,
+       },
+};
 
 #define DEFAULT_LOG_LEVEL L_NOTICE
 
@@ -53,12 +83,40 @@ 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_buf_valid(&udb_log))
+               return;
+
+       udebug_entry_init(&udb_log);
+       udebug_entry_vprintf(&udb_log, format, ap);
+       udebug_entry_add(&udb_log);
+}
+
+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_config(struct udebug_ubus *ctx, struct blob_attr *data,
+                         bool enabled)
+{
+       udebug_ubus_apply_config(&ud, rings, ARRAY_SIZE(rings), data, enabled);
+}
+
 void
+__attribute__((format(printf, 2, 0)))
 netifd_log_message(int priority, const char *format, ...)
 {
        va_list vl;
@@ -66,6 +124,10 @@ netifd_log_message(int priority, const char *format, ...)
        if (priority > log_level)
                return;
 
+       va_start(vl, format);
+       netifd_udebug_vprintf(format, vl);
+       va_end(vl);
+
        va_start(vl, format);
        if (use_syslog)
                vsyslog(log_class[priority], format, vl);
@@ -123,9 +185,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
@@ -152,7 +214,7 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                        }
                }
                if (proc->dir_fd >= 0)
-                       fchdir(proc->dir_fd);
+                       if (fchdir(proc->dir_fd)) {}
 
                close(pfds[0]);
 
@@ -170,9 +232,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                exit(127);
        }
 
-       if (pid < 0)
-               goto error;
-
        close(pfds[1]);
        proc->uloop.cb = netifd_process_cb;
        proc->uloop.pid = pid;
@@ -208,22 +267,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)
-{
-       config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
-void netifd_reload(void)
+int 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);
 }
@@ -235,11 +289,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;
@@ -284,7 +339,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);
@@ -295,6 +350,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;
@@ -303,8 +361,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':
@@ -320,11 +378,21 @@ int main(int argc, char **argv)
                openlog("netifd", 0, LOG_DAEMON);
 
        netifd_setup_signals();
+       uloop_init();
+       udebug_init(&ud);
+       udebug_auto_connect(&ud, NULL);
+       for (size_t i = 0; i < ARRAY_SIZE(rings); i++)
+               udebug_ubus_ring_init(&ud, &rings[i]);
+
        if (netifd_ubus_init(socket) < 0) {
                fprintf(stderr, "Failed to connect to ubus\n");
                return 1;
        }
 
+       proto_shell_init();
+       extdev_init();
+       wireless_init();
+
        if (system_init()) {
                fprintf(stderr, "Failed to initialize system control\n");
                return 1;