logd: add udebug support

[project/ubox.git] / log / logd.c

diff --git a/log/logd.c b/log/logd.c
index 07aee2bdad2acd5572fc0033b5621e65941f6324..96042964a5f8c07041d4e899fc7f0fe31e910b9c 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#include <sys/types.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -22,6 +24,7 @@
 #include <libubox/blobmsg.h>
 #include <libubox/list.h>
 #include <libubox/ustream.h>
+#include <libubox/utils.h>
 #include <libubus.h>
 
 #include "syslog.h"
@@ -29,17 +32,20 @@
 int debug = 0;
 static struct blob_buf b;
 static struct ubus_auto_conn conn;
+static struct udebug_ubus udebug;
 static LIST_HEAD(clients);
 
 enum {
        READ_LINES,
        READ_STREAM,
+       READ_ONESHOT,
        __READ_MAX
 };
 
 static const struct blobmsg_policy read_policy[__READ_MAX] = {
        [READ_LINES] = { .name = "lines", .type = BLOBMSG_TYPE_INT32 },
        [READ_STREAM] = { .name = "stream", .type = BLOBMSG_TYPE_BOOL },
+       [READ_ONESHOT] = { .name = "oneshot", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static const struct blobmsg_policy write_policy =
@@ -68,6 +74,14 @@ static void client_notify_state(struct ustream *s)
        client_close(s);
 }
 
+static void client_notify_write(struct ustream *s, int bytes)
+{
+       if (ustream_pending_data(s, true))
+               return;
+
+       client_close(s);
+}
+
 static void
 log_fill_msg(struct blob_buf *b, struct log_head *l)
 {
@@ -84,12 +98,13 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct client *cl;
-       struct blob_attr *tb[__READ_MAX] = { 0 };
+       struct blob_attr *tb[__READ_MAX] = {};
        struct log_head *l;
        int count = 0;
        int fds[2];
        int ret;
        bool stream = true;
+       bool oneshot = false;
        void *c, *e;
 
        if (!stream)
@@ -101,15 +116,17 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                        count = blobmsg_get_u32(tb[READ_LINES]);
                if (tb[READ_STREAM])
                        stream = blobmsg_get_bool(tb[READ_STREAM]);
-       }
-
-       if (pipe(fds) == -1) {
-               fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
-               return -1;
+               if (tb[READ_ONESHOT])
+                       oneshot = blobmsg_get_bool(tb[READ_ONESHOT]);
        }
 
        l = log_list(count, NULL);
        if (stream) {
+               if (pipe(fds) == -1) {
+                       fprintf(stderr, "logd: failed to create pipe: %m\n");
+                       return -1;
+               }
+
                ubus_request_set_fd(ctx, req, fds[0]);
                cl = calloc(1, sizeof(*cl));
                cl->s.stream.notify_state = client_notify_state;
@@ -124,6 +141,11 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
                        if (ret < 0)
                                break;
                }
+
+               if (oneshot) {
+                       cl->s.stream.notify_write = client_notify_write;
+                       client_notify_write(&cl->s.stream, 0);
+               }
        } else {
                blob_buf_init(&b, 0);
                c = blobmsg_open_array(&b, "log");
@@ -149,10 +171,18 @@ write_log(struct ubus_context *ctx, struct ubus_object *obj,
        char *event;
 
        if (msg) {
+               int len;
+
                blobmsg_parse(&write_policy, 1, &tb, blob_data(msg), blob_len(msg));
                if (tb) {
                        event = blobmsg_get_string(tb);
-                       log_add(event, strlen(event) + 1, SOURCE_SYSLOG);
+                       len = strlen(event) + 1;
+                       if (len > LOG_LINE_SIZE) {
+                               len = LOG_LINE_SIZE;
+                               event[len - 1] = 0;
+                       }
+
+                       log_add(event, len, SOURCE_SYSLOG);
                }
        }
 
@@ -179,7 +209,7 @@ ubus_notify_log(struct log_head *l)
 {
        struct client *c;
 
-       if (list_empty(&clients))
+       if (list_empty(&clients) && !log_object.has_subscribers)
                return;
 
        blob_buf_init(&b, 0);
@@ -189,6 +219,9 @@ ubus_notify_log(struct log_head *l)
        blobmsg_add_u32(&b, "source", l->source);
        blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
 
+       if (log_object.has_subscribers)
+               ubus_notify(&conn.ctx, &log_object, "message", b.head, -1);
+
        list_for_each_entry(c, &clients, list)
                ustream_write(&c->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
 
@@ -212,6 +245,7 @@ int
 main(int argc, char **argv)
 {
        int ch, log_size = 16;
+       struct passwd *p = NULL;
 
        signal(SIGPIPE, SIG_IGN);
        while ((ch = getopt(argc, argv, "S:")) != -1) {
@@ -229,7 +263,21 @@ main(int argc, char **argv)
        log_init(log_size);
        conn.cb = ubus_connect_handler;
        ubus_auto_connect(&conn);
+       udebug_ubus_init(&udebug, &conn.ctx, "log", log_udebug_config);
+       p = getpwnam("logd");
+       if (p) {
+               if (setgid(p->pw_gid) < 0) {
+                       fprintf(stderr, "setgid() failed: %s\n", strerror(errno));
+                       exit(1);
+               }
+
+               if (setuid(p->pw_uid) < 0) {
+                       fprintf(stderr, "setuid() failed: %s\n", strerror(errno));
+                       exit(1);
+               }
+       }
        uloop_run();
+       udebug_ubus_free(&udebug);
        log_shutdown();
        uloop_done();
        ubus_auto_shutdown(&conn);