CMake: bump the minimum required CMake version to 3.5

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index 874dc8bd2215edf38016539801343e4f4e07f2de..375c6ab7873d075d4a6aa6f7eea15bed9fc6ef4d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -35,6 +35,32 @@ 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
 
@@ -63,7 +89,34 @@ netifd_delete_process(struct netifd_process *proc)
        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;
@@ -71,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);
@@ -129,7 +186,8 @@ netifd_process_cb(struct uloop_process *proc, int ret)
        np = container_of(proc, struct netifd_process, uloop);
 
        netifd_delete_process(np);
-       return np->cb(np, ret);
+       np->cb(np, ret);
+       return;
 }
 
 int
@@ -320,6 +378,12 @@ 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;