static void
log_fill_msg(struct blob_buf *b, struct log_head *l)
{
- blob_buf_init(b, 0);
blobmsg_add_string(b, "msg", l->data);
blobmsg_add_u32(b, "id", l->id);
blobmsg_add_u32(b, "priority", l->priority);
struct blob_attr *msg)
{
struct client *cl;
- struct blob_attr *tb[__READ_MAX];
+ struct blob_attr *tb[__READ_MAX] = { 0 };
struct log_head *l;
int count = 0;
int fds[2];
int ret;
bool stream = true;
+ void *c, *e;
+
+ if (!stream)
+ count = 100;
if (msg) {
blobmsg_parse(read_policy, __READ_MAX, tb, blob_data(msg), blob_len(msg));
if (tb[READ_STREAM])
stream = blobmsg_get_bool(tb[READ_STREAM]);
}
- if (!stream)
- count = 100;
if (pipe(fds) == -1) {
fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
ustream_fd_init(&cl->s, cl->fd);
list_add(&cl->list, &clients);
while ((!tb[READ_LINES] || count) && l) {
+ blob_buf_init(&b, 0);
log_fill_msg(&b, l);
l = log_list(count, l);
ret = ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
break;
}
} else {
+ blob_buf_init(&b, 0);
+ c = blobmsg_open_array(&b, "log");
while ((!tb[READ_LINES] || count) && l) {
+ e = blobmsg_open_table(&b, NULL);
log_fill_msg(&b, l);
- ubus_send_reply(ctx, req, b.head);
+ blobmsg_close_table(&b, e);
l = log_list(count, l);
}
+ blobmsg_close_array(&b, c);
+ ubus_send_reply(ctx, req, b.head);
}
blob_buf_free(&b);
return 0;
uloop_run();
log_shutdown();
uloop_done();
+ ubus_auto_shutdown(&conn);
return 0;
}