+/*
+ * Copyright (C) 2011-2014 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include <sys/types.h>
-#include <sys/uio.h>
#include <sys/socket.h>
#include <unistd.h>
#include <libubox/blob.h>
#include <libubox/blobmsg.h>
-#include <libubox/usock.h>
#include "libubus.h"
+#include "libubus-internal.h"
#include "ubusmsg.h"
-#define DEBUG 1
-
-#ifdef DEBUG
-#define DPRINTF(_format, ...) fprintf(stderr, "ubus: " _format, ## __VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
-#define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) }
-
const char *__ubus_strerror[__UBUS_STATUS_LAST] = {
[UBUS_STATUS_OK] = "Success",
[UBUS_STATUS_INVALID_COMMAND] = "Invalid command",
[UBUS_STATUS_NOT_FOUND] = "Not found",
[UBUS_STATUS_NO_DATA] = "No response",
[UBUS_STATUS_PERMISSION_DENIED] = "Permission denied",
+ [UBUS_STATUS_TIMEOUT] = "Request timed out",
+ [UBUS_STATUS_NOT_SUPPORTED] = "Operation not supported",
+ [UBUS_STATUS_UNKNOWN_ERROR] = "Unknown error",
+ [UBUS_STATUS_CONNECTION_FAILED] = "Connection failed",
};
-static struct blob_buf b;
+struct blob_buf b __hidden = {};
-static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
- [UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
- [UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
- [UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING },
- [UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
-};
-static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
-
-struct ubus_pending_data {
+struct ubus_pending_msg {
struct list_head list;
- int type;
- struct blob_attr data[];
+ struct ubus_msghdr_buf hdr;
};
static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
return *id1 > *id2;
}
-static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
-{
- blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
- return attrbuf;
-}
-
const char *ubus_strerror(int error)
{
static char err[32];
return err;
}
-static int ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
- struct blob_attr *msg, int cmd, uint32_t peer)
-{
- struct ubus_msghdr hdr;
- struct iovec iov[2] = {
- STATIC_IOV(hdr)
- };
-
- hdr.version = 0;
- hdr.type = cmd;
- hdr.seq = seq;
- hdr.peer = peer;
-
- if (!msg) {
- blob_buf_init(&b, 0);
- msg = b.head;
- }
-
- iov[1].iov_base = (char *) msg;
- iov[1].iov_len = blob_raw_len(msg);
-
- return writev(ctx->sock.fd, iov, 2);
-}
-
-static int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
- struct blob_attr *msg, int cmd, uint32_t peer)
-{
- memset(req, 0, sizeof(*req));
-
- INIT_LIST_HEAD(&req->list);
- INIT_LIST_HEAD(&req->pending);
- req->ctx = ctx;
- req->peer = peer;
- req->seq = ++ctx->request_seq;
- return ubus_send_msg(ctx, req->seq, msg, cmd, peer);
-}
-
-static bool recv_retry(int fd, struct iovec *iov, bool wait)
-{
- int bytes;
-
- while (iov->iov_len > 0) {
- bytes = read(fd, iov->iov_base, iov->iov_len);
- if (bytes < 0) {
- bytes = 0;
- if (uloop_cancelled)
- return false;
- if (errno == EINTR)
- continue;
-
- if (errno != EAGAIN) {
- perror("read");
- return false;
- }
- }
- if (!wait && !bytes)
- return false;
-
- wait = true;
- iov->iov_len -= bytes;
- iov->iov_base += bytes;
- }
-
- return true;
-}
-
-static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
-{
- if (hdr->version != 0)
- return false;
-
- if (blob_raw_len(hdr->data) < sizeof(*hdr->data))
- return false;
-
- if (blob_raw_len(hdr->data) + sizeof(*hdr) > UBUS_MAX_MSGLEN)
- return false;
-
- return true;
-}
-
-static bool get_next_msg(struct ubus_context *ctx, bool wait)
-{
- struct iovec iov = STATIC_IOV(ctx->msgbuf.hdr);
-
- /* receive header + start attribute */
- iov.iov_len += sizeof(struct blob_attr);
- if (!recv_retry(ctx->sock.fd, &iov, wait))
- return false;
-
- iov.iov_len = blob_len(ctx->msgbuf.hdr.data);
- if (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true))
- return false;
-
- return ubus_validate_hdr(&ctx->msgbuf.hdr);
-}
-
-static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
+static void
+ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
{
- ubus_parse_msg(hdr->data);
-
- if (!attrbuf[UBUS_ATTR_STATUS])
- return false;
+ struct ubus_pending_msg *pending;
+ void *data;
- *ret = blob_get_u32(attrbuf[UBUS_ATTR_STATUS]);
- return true;
-}
-
-static void req_data_cb(struct ubus_request *req, int type, struct blob_attr *data)
-{
- struct blob_attr **attr;
-
- if (req->raw_data_cb)
- req->raw_data_cb(req, type, data);
-
- if (!req->data_cb)
- return;
-
- attr = ubus_parse_msg(data);
- req->data_cb(req, type, attr[UBUS_ATTR_DATA]);
-}
-
-static void ubus_process_req_data(struct ubus_request *req)
-{
- struct ubus_pending_data *data;
-
- while (!list_empty(&req->pending)) {
- data = list_first_entry(&req->pending,
- struct ubus_pending_data, list);
- list_del(&data->list);
- if (!req->cancelled)
- req_data_cb(req, data->type, data->data);
- free(data);
- }
-}
-
-static void ubus_req_complete_cb(struct ubus_request *req)
-{
- ubus_complete_handler_t cb = req->complete_cb;
-
- if (!cb)
- return;
-
- req->complete_cb = NULL;
- cb(req, req->status_code);
-}
-
-static int ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr *hdr)
-{
- int ret = UBUS_STATUS_INVALID_ARGUMENT;
-
- if (!list_empty(&req->list))
- list_del(&req->list);
-
- ubus_get_status(hdr, &ret);
- req->peer = hdr->peer;
- req->status_msg = true;
- req->status_code = ret;
- if (!req->blocked)
- ubus_req_complete_cb(req);
-
- return ret;
-}
-
-static void ubus_req_data(struct ubus_request *req, struct ubus_msghdr *hdr)
-{
- struct ubus_pending_data *data;
- int len;
+ pending = calloc_a(sizeof(*pending), &data, blob_raw_len(buf->data));
- if (!req->blocked) {
- req->blocked = true;
- req_data_cb(req, hdr->type, hdr->data);
- ubus_process_req_data(req);
- req->blocked = false;
-
- if (req->status_msg)
- ubus_req_complete_cb(req);
-
- return;
- }
-
- len = blob_raw_len(hdr->data);
- data = calloc(1, sizeof(*data) + len);
- if (!data)
- return;
-
- data->type = hdr->type;
- memcpy(data->data, hdr->data, len);
- list_add(&data->list, &req->pending);
-}
-
-static struct ubus_request *ubus_find_request(struct ubus_context *ctx, uint32_t seq, uint32_t peer)
-{
- struct ubus_request *req;
-
- list_for_each_entry(req, &ctx->requests, list) {
- if (seq != req->seq || peer != req->peer)
- continue;
-
- return req;
- }
- return NULL;
-}
-
-static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr)
-{
- struct ubus_request_data req;
- struct ubus_object *obj;
- uint32_t objid = 0;
- int method;
- int ret = 0;
-
- ubus_parse_msg(hdr->data);
-
- if (!attrbuf[UBUS_ATTR_OBJID])
- return;
-
- objid = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
-
- if (!attrbuf[UBUS_ATTR_METHOD]) {
- ret = UBUS_STATUS_INVALID_ARGUMENT;
- goto send;
- }
-
- obj = avl_find_element(&ctx->objects, &objid, obj, avl);
- if (!obj) {
- ret = UBUS_STATUS_NOT_FOUND;
- goto send;
- }
-
- for (method = 0; method < obj->n_methods; method++)
- if (!obj->methods[method].name ||
- !strcmp(obj->methods[method].name,
- blob_data(attrbuf[UBUS_ATTR_METHOD])))
- goto found;
-
- /* not found */
- ret = UBUS_STATUS_METHOD_NOT_FOUND;
- goto send;
-
-found:
- req.object = objid;
- req.peer = hdr->peer;
- req.seq = hdr->seq;
- ret = obj->methods[method].handler(ctx, obj, &req,
- obj->methods[method].name,
- attrbuf[UBUS_ATTR_DATA]);
-
-send:
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_STATUS, ret);
- blob_put_int32(&b, UBUS_ATTR_OBJID, objid);
- ubus_send_msg(ctx, hdr->seq, b.head, UBUS_MSG_STATUS, hdr->peer);
+ pending->hdr.data = data;
+ memcpy(&pending->hdr.hdr, &buf->hdr, sizeof(buf->hdr));
+ memcpy(data, buf->data, blob_raw_len(buf->data));
+ list_add(&pending->list, &ctx->pending);
+ if (ctx->sock.registered)
+ uloop_timeout_set(&ctx->pending_timer, 1);
}
-static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
+void __hidden
+ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
{
- struct ubus_request *req;
-
- switch(hdr->type) {
+ switch(buf->hdr.type) {
case UBUS_MSG_STATUS:
- req = ubus_find_request(ctx, hdr->seq, hdr->peer);
- if (!req)
- break;
-
- ubus_process_req_status(req, hdr);
- break;
-
case UBUS_MSG_DATA:
- req = ubus_find_request(ctx, hdr->seq, hdr->peer);
- if (req && (req->data_cb || req->raw_data_cb))
- ubus_req_data(req, hdr);
+ ubus_process_req_msg(ctx, buf, fd);
break;
case UBUS_MSG_INVOKE:
- ubus_process_invoke(ctx, hdr);
- break;
- default:
- DPRINTF("unknown message type: %d\n", hdr->type);
+ case UBUS_MSG_UNSUBSCRIBE:
+ case UBUS_MSG_NOTIFY:
+ if (ctx->stack_depth) {
+ ubus_queue_msg(ctx, buf);
+ break;
+ }
+
+ ubus_process_obj_msg(ctx, buf);
break;
}
}
-void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
-{
- if (!list_empty(&req->list))
- return;
-
- req->cancelled = true;
- ubus_process_req_data(req);
- list_del(&req->list);
-}
-
-void ubus_complete_request_async(struct ubus_context *ctx, struct ubus_request *req)
-{
- if (!list_empty(&req->list))
- return;
-
- list_add(&req->list, &ctx->requests);
-}
-
-static void ubus_handle_data(struct uloop_fd *u, unsigned int events)
-{
- struct ubus_context *ctx = container_of(u, struct ubus_context, sock);
- struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
-
- while (get_next_msg(ctx, false))
- ubus_process_msg(ctx, hdr);
-
- if (u->eof)
- ctx->connection_lost(ctx);
-}
-
-int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req)
+static void ubus_process_pending_msg(struct uloop_timeout *timeout)
{
- struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
-
- if (!list_empty(&req->list))
- list_del(&req->list);
-
- while (1) {
- if (req->status_msg)
- return req->status_code;
-
- if (req->cancelled)
- return UBUS_STATUS_NO_DATA;
-
- if (!get_next_msg(ctx, true))
- return UBUS_STATUS_NO_DATA;
-
- if (hdr->seq != req->seq || hdr->peer != req->peer)
- goto skip;
-
- switch(hdr->type) {
- case UBUS_MSG_STATUS:
- return ubus_process_req_status(req, hdr);
- case UBUS_MSG_DATA:
- if (req->data_cb || req->raw_data_cb)
- ubus_req_data(req, hdr);
- continue;
- default:
- goto skip;
- }
+ struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
+ struct ubus_pending_msg *pending;
-skip:
- ubus_process_msg(ctx, hdr);
+ while (!ctx->stack_depth && !list_empty(&ctx->pending)) {
+ pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
+ list_del(&pending->list);
+ ubus_process_msg(ctx, &pending->hdr, -1);
+ free(pending);
}
}
blob_buf_init(&b, 0);
if (path)
blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
- ubus_start_request(ctx, &lookup.req, b.head, UBUS_MSG_LOOKUP, 0);
+
+ if (ubus_start_request(ctx, &lookup.req, b.head, UBUS_MSG_LOOKUP, 0) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
lookup.req.raw_data_cb = ubus_lookup_cb;
lookup.req.priv = priv;
lookup.cb = cb;
- return ubus_complete_request(ctx, &lookup.req);
+ return ubus_complete_request(ctx, &lookup.req, 0);
}
static void ubus_lookup_id_cb(struct ubus_request *req, int type, struct blob_attr *msg)
blob_buf_init(&b, 0);
if (path)
blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0);
- req.raw_data_cb = ubus_lookup_id_cb;
- req.priv = id;
-
- return ubus_complete_request(ctx, &req);
-}
-int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
- struct blob_attr *msg)
-{
- int ret;
-
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_OBJID, req->object);
- blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
- ret = ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_DATA, req->peer);
- if (ret < 0)
- return UBUS_STATUS_NO_DATA;
-
- return 0;
-}
-
-void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
- struct blob_attr *msg, struct ubus_request *req)
-{
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
- blob_put_string(&b, UBUS_ATTR_METHOD, method);
- if (msg)
- blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
-
- ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj);
-}
-
-int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
- struct blob_attr *msg, ubus_data_handler_t cb, void *priv)
-{
- struct ubus_request req;
-
- ubus_invoke_async(ctx, obj, method, msg, &req);
- req.data_cb = cb;
- req.priv = priv;
- return ubus_complete_request(ctx, &req);
-}
-
-static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
-{
- struct ubus_object *obj = req->priv;
-
- ubus_parse_msg(msg);
-
- if (!attrbuf[UBUS_ATTR_OBJID])
- return;
-
- obj->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
-
- if (attrbuf[UBUS_ATTR_OBJTYPE])
- obj->type->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJTYPE]);
-
- obj->avl.key = &obj->id;
- avl_insert(&req->ctx->objects, &obj->avl);
-}
-
-static bool ubus_push_table_data(const struct ubus_signature **sig, int *rem, bool array)
-{
- const struct ubus_signature *cur;
- bool nest_type;
- void *nest;
-
- while (rem) {
- cur = (*sig)++;
- (*rem)--;
- switch(cur->type) {
- case UBUS_SIGNATURE_END:
- return !array;
- case BLOBMSG_TYPE_INT32:
- case BLOBMSG_TYPE_STRING:
- blobmsg_add_u32(&b, cur->name, cur->type);
- break;
- case BLOBMSG_TYPE_TABLE:
- case BLOBMSG_TYPE_ARRAY:
- nest_type = cur->type == BLOBMSG_TYPE_ARRAY;
- nest = blobmsg_open_nested(&b, cur->name, nest_type);
- if (!ubus_push_table_data(sig, rem, nest_type))
- return false;
- blobmsg_close_table(&b, nest);
- break;
- default:
- return false;
- }
- if (array)
- return true;
- }
- return false;
-}
-
-static bool ubus_push_object_type(struct ubus_object_type *type)
-{
- void *s, *m;
- int rem = type->n_signature;
- const struct ubus_signature *sig = type->signature;
-
- s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
- while (rem) {
- if (sig->type != UBUS_SIGNATURE_METHOD)
- return false;
-
- m = blobmsg_open_table(&b, sig->name);
-
- sig++;
- rem--;
- if (!ubus_push_table_data(&sig, &rem, false))
- return false;
-
- blobmsg_close_table(&b, m);
- }
- blob_nest_end(&b, s);
-
- return true;
-}
-
-static int __ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
-{
- struct ubus_request req;
- int ret;
-
- blob_buf_init(&b, 0);
-
- if (obj->name && obj->type) {
- blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name);
-
- if (obj->type->id)
- blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id);
- else if (!ubus_push_object_type(obj->type))
- return UBUS_STATUS_INVALID_ARGUMENT;
- }
-
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_ADD_OBJECT, 0);
- req.raw_data_cb = ubus_add_object_cb;
- req.priv = obj;
- ret = ubus_complete_request(ctx, &req);
- if (ret)
- return ret;
-
- if (!obj->id)
- return UBUS_STATUS_NO_DATA;
-
- return 0;
-}
-
-int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
-{
- if (!obj->name || !obj->type)
+ if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0) < 0)
return UBUS_STATUS_INVALID_ARGUMENT;
- return __ubus_add_object(ctx, obj);
-}
-
-static void ubus_remove_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
-{
- struct ubus_object *obj = req->priv;
-
- ubus_parse_msg(msg);
-
- if (!attrbuf[UBUS_ATTR_OBJID])
- return;
-
- obj->id = 0;
-
- if (attrbuf[UBUS_ATTR_OBJTYPE] && obj->type)
- obj->type->id = 0;
-
- avl_delete(&req->ctx->objects, &obj->avl);
-}
-
-int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj)
-{
- struct ubus_request req;
- int ret;
-
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id);
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_REMOVE_OBJECT, 0);
- req.raw_data_cb = ubus_remove_object_cb;
- req.priv = obj;
- ret = ubus_complete_request(ctx, &req);
- if (ret)
- return ret;
-
- if (obj->id)
- return UBUS_STATUS_NO_DATA;
+ req.raw_data_cb = ubus_lookup_id_cb;
+ req.priv = id;
- return 0;
+ return ubus_complete_request(ctx, &req, 0);
}
static int ubus_event_cb(struct ubus_context *ctx, struct ubus_object *obj,
if (!!obj->name ^ !!obj->type)
return UBUS_STATUS_INVALID_ARGUMENT;
- ret = __ubus_add_object(ctx, obj);
+ ret = ubus_add_object(ctx, obj);
if (ret)
return ret;
}
blobmsg_add_string(&b2, "pattern", pattern);
ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
- NULL, NULL);
+ NULL, NULL, 0);
+ blob_buf_free(&b2);
- return 0;
+ return ret;
}
+int ubus_send_event(struct ubus_context *ctx, const char *id,
+ struct blob_attr *data)
+{
+ struct ubus_request req;
+ void *s;
+
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, UBUS_SYSTEM_OBJECT_EVENT);
+ blob_put_string(&b, UBUS_ATTR_METHOD, "send");
+ s = blob_nest_start(&b, UBUS_ATTR_DATA);
+ blobmsg_add_string(&b, "id", id);
+ blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "data", blob_data(data), blob_len(data));
+ blob_nest_end(&b, s);
+
+ if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, UBUS_SYSTEM_OBJECT_EVENT) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ return ubus_complete_request(ctx, &req, 0);
+}
static void ubus_default_connection_lost(struct ubus_context *ctx)
{
uloop_end();
}
-struct ubus_context *ubus_connect(const char *path)
+int ubus_connect_ctx(struct ubus_context *ctx, const char *path)
{
- struct ubus_context *ctx;
- struct {
- struct ubus_msghdr hdr;
- struct blob_attr data;
- } hdr;
- struct blob_attr *buf;
+ memset(ctx, 0, sizeof(*ctx));
- if (!path)
- path = UBUS_UNIX_SOCKET;
+ ctx->sock.fd = -1;
+ ctx->sock.cb = ubus_handle_data;
+ ctx->connection_lost = ubus_default_connection_lost;
+ ctx->pending_timer.cb = ubus_process_pending_msg;
- ctx = calloc(1, sizeof(*ctx));
- if (!ctx)
- goto error;
+ ctx->msgbuf.data = calloc(UBUS_MSG_CHUNK_SIZE, sizeof(char));
+ if (!ctx->msgbuf.data)
+ return -1;
+ ctx->msgbuf_data_len = UBUS_MSG_CHUNK_SIZE;
- ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
- if (ctx->sock.fd < 0)
- goto error_free;
+ INIT_LIST_HEAD(&ctx->requests);
+ INIT_LIST_HEAD(&ctx->pending);
+ avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
+ if (ubus_reconnect(ctx, path)) {
+ free(ctx->msgbuf.data);
+ return -1;
+ }
- ctx->sock.cb = ubus_handle_data;
+ return 0;
+}
+
+static void ubus_auto_reconnect_cb(struct uloop_timeout *timeout)
+{
+ struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
- if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr))
- goto error_close;
+ if (!ubus_reconnect(&conn->ctx, conn->path))
+ ubus_add_uloop(&conn->ctx);
+ else
+ uloop_timeout_set(timeout, 1000);
+}
- if (!ubus_validate_hdr(&hdr.hdr))
- goto error_close;
+static void ubus_auto_disconnect_cb(struct ubus_context *ctx)
+{
+ struct ubus_auto_conn *conn = container_of(ctx, struct ubus_auto_conn, ctx);
- if (hdr.hdr.type != UBUS_MSG_HELLO)
- goto error_close;
+ conn->timer.cb = ubus_auto_reconnect_cb;
+ uloop_timeout_set(&conn->timer, 1000);
+}
- buf = calloc(1, blob_raw_len(&hdr.data));
- if (!buf)
- goto error_close;
+static void ubus_auto_connect_cb(struct uloop_timeout *timeout)
+{
+ struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
- memcpy(buf, &hdr.data, sizeof(hdr.data));
- if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf))
- goto error_free_buf;
+ if (ubus_connect_ctx(&conn->ctx, conn->path)) {
+ uloop_timeout_set(timeout, 1000);
+ fprintf(stderr, "failed to connect to ubus\n");
+ return;
+ }
+ conn->ctx.connection_lost = ubus_auto_disconnect_cb;
+ if (conn->cb)
+ conn->cb(&conn->ctx);
+ ubus_add_uloop(&conn->ctx);
+}
- ctx->local_id = hdr.hdr.peer;
- free(buf);
+void ubus_auto_connect(struct ubus_auto_conn *conn)
+{
+ conn->timer.cb = ubus_auto_connect_cb;
+ ubus_auto_connect_cb(&conn->timer);
+}
- ctx->connection_lost = ubus_default_connection_lost;
+struct ubus_context *ubus_connect(const char *path)
+{
+ struct ubus_context *ctx;
- INIT_LIST_HEAD(&ctx->requests);
- avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
+ ctx = calloc(1, sizeof(*ctx));
+ if (!ctx)
+ return NULL;
- if (!ctx->local_id)
- goto error_close;
+ if (ubus_connect_ctx(ctx, path)) {
+ free(ctx);
+ ctx = NULL;
+ }
return ctx;
+}
-error_free_buf:
- free(buf);
-error_close:
+void ubus_shutdown(struct ubus_context *ctx)
+{
+ blob_buf_free(&b);
close(ctx->sock.fd);
-error_free:
- free(ctx);
-error:
- return NULL;
+ free(ctx->msgbuf.data);
}
void ubus_free(struct ubus_context *ctx)
{
- close(ctx->sock.fd);
+ ubus_shutdown(ctx);
free(ctx);
}
projects / project / ubus.git / blobdiff