X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=e9809cf14cf09043e9df311f4be3af9083ae6986;hp=64190f78df2e294b7ec8389628520bc0b26d3e6e;hb=7cd33a8e3a64a2b181fe9722b599302b62c7147c;hpb=7b262aec3843912d68e020f0750b6f96e2f7c8e3

diff --git a/libubus.c b/libubus.c
index 64190f7..e9809cf 100644
--- a/libubus.c
+++ b/libubus.c
@@ -1,25 +1,27 @@
+/*
+ * Copyright (C) 2011-2012 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",
@@ -27,17 +29,14 @@ const char *__ubus_strerror[__UBUS_STATUS_LAST] = {
 	[UBUS_STATUS_METHOD_NOT_FOUND] = "Method not found",
 	[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;
-
-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 blob_buf b __hidden = {};
 
 struct ubus_pending_data {
 	struct list_head list;
@@ -45,6 +44,13 @@ struct ubus_pending_data {
 	struct blob_attr data[];
 };
 
+struct ubus_pending_invoke {
+	struct list_head list;
+	struct ubus_msghdr hdr;
+};
+
+static void ubus_process_pending_invoke(struct ubus_context *ctx);
+
 static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
 {
 	const uint32_t *id1 = k1, *id2 = k2;
@@ -55,12 +61,6 @@ static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
 		return *id1 > *id2;
 }
 
-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];
@@ -78,109 +78,29 @@ out:
 	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);
-}
-
-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 (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)
+static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
 {
-	if (hdr->version != 0)
-		return false;
-
-	if (blob_raw_len(hdr->data) < sizeof(*hdr->data))
-		return false;
+	struct blob_attr **attrbuf = ubus_parse_msg(hdr->data);
 
-	if (blob_raw_len(hdr->data) + sizeof(*hdr) > UBUS_MAX_MSGLEN)
+	if (!attrbuf[UBUS_ATTR_STATUS])
 		return false;
 
+	*ret = blob_get_u32(attrbuf[UBUS_ATTR_STATUS]);
 	return true;
 }
 
-static bool get_next_msg(struct ubus_context *ctx, bool wait)
+static void req_data_cb(struct ubus_request *req, int type, struct blob_attr *data)
 {
-	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);
-}
+	struct blob_attr **attr;
 
-static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
-{
-	ubus_parse_msg(hdr->data);
+	if (req->raw_data_cb)
+		req->raw_data_cb(req, type, data);
 
-	if (!attrbuf[UBUS_ATTR_STATUS])
-		return false;
+	if (!req->data_cb)
+		return;
 
-	*ret = blob_get_int32(attrbuf[UBUS_ATTR_STATUS]);
-	return true;
+	attr = ubus_parse_msg(data);
+	req->data_cb(req, type, attr[UBUS_ATTR_DATA]);
 }
 
 static void ubus_process_req_data(struct ubus_request *req)
@@ -192,7 +112,7 @@ static void ubus_process_req_data(struct ubus_request *req)
 			struct ubus_pending_data, list);
 		list_del(&data->list);
 		if (!req->cancelled)
-			req->data_cb(req, data->type, data->data);
+			req_data_cb(req, data->type, data->data);
 		free(data);
 	}
 }
@@ -213,7 +133,7 @@ static int ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr
 	int ret = UBUS_STATUS_INVALID_ARGUMENT;
 
 	if (!list_empty(&req->list))
-		list_del(&req->list);
+		list_del_init(&req->list);
 
 	ubus_get_status(hdr, &ret);
 	req->peer = hdr->peer;
@@ -232,7 +152,7 @@ static void ubus_req_data(struct ubus_request *req, struct ubus_msghdr *hdr)
 
 	if (!req->blocked) {
 		req->blocked = true;
-		req->data_cb(req, hdr->type, hdr->data);
+		req_data_cb(req, hdr->type, hdr->data);
 		ubus_process_req_data(req);
 		req->blocked = false;
 
@@ -265,57 +185,17 @@ static struct ubus_request *ubus_find_request(struct ubus_context *ctx, uint32_t
 	return NULL;
 }
 
-static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr)
+void ubus_complete_deferred_request(struct ubus_context *ctx, struct ubus_request_data *req, int ret)
 {
-	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_int32(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 (!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(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);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, req->object);
+	ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_STATUS, req->peer);
 }
 
-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 *hdr)
 {
+	struct ubus_pending_invoke *pending;
 	struct ubus_request *req;
 
 	switch(hdr->type) {
@@ -329,19 +209,43 @@ static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 
 	case UBUS_MSG_DATA:
 		req = ubus_find_request(ctx, hdr->seq, hdr->peer);
-		if (req && req->data_cb)
+		if (req && (req->data_cb || req->raw_data_cb))
 			ubus_req_data(req, hdr);
 		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 > 2) {
+			pending = calloc(1, sizeof(*pending) +
+				blob_raw_len(hdr->data));
+
+			if (!pending)
+				return;
+
+			memcpy(&pending->hdr, hdr, sizeof(*hdr) +
+				blob_raw_len(hdr->data));
+			list_add(&pending->list, &ctx->pending);
+		} else {
+			ubus_process_obj_msg(ctx, hdr);
+		}
 		break;
 	}
 }
 
+static void ubus_process_pending_invoke(struct ubus_context *ctx)
+{
+	struct ubus_pending_invoke *pending, *tmp;
+
+	list_for_each_entry_safe(pending, tmp, &ctx->pending, list) {
+		list_del(&pending->list);
+		ubus_process_msg(ctx, &pending->hdr);
+		free(pending);
+		if (ctx->stack_depth > 2)
+			break;
+	}
+}
+
 void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
 {
 	if (!list_empty(&req->list))
@@ -349,7 +253,7 @@ void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
 
 	req->cancelled = true;
 	ubus_process_req_data(req);
-	list_del(&req->list);
+	list_del_init(&req->list);
 }
 
 void ubus_complete_request_async(struct ubus_context *ctx, struct ubus_request *req)
@@ -360,182 +264,279 @@ void ubus_complete_request_async(struct ubus_context *ctx, struct ubus_request *
 	list_add(&req->list, &ctx->requests);
 }
 
-static void ubus_handle_data(struct uloop_fd *u, unsigned int events)
+static void ubus_sync_req_cb(struct ubus_request *req, int ret)
 {
-	struct ubus_context *ctx = container_of(u, struct ubus_context, sock);
-	struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
+	req->status_msg = true;
+	req->status_code = ret;
+	uloop_end();
+}
 
-	while (get_next_msg(ctx, false))
-		ubus_process_msg(ctx, hdr);
+struct ubus_sync_req_cb {
+	struct uloop_timeout timeout;
+	struct ubus_request *req;
+};
 
-	if (u->eof)
-		ctx->connection_lost(ctx);
+static void ubus_sync_req_timeout_cb(struct uloop_timeout *timeout)
+{
+	struct ubus_sync_req_cb *cb;
+
+	cb = container_of(timeout, struct ubus_sync_req_cb, timeout);
+	ubus_sync_req_cb(cb->req, UBUS_STATUS_TIMEOUT);
 }
 
-int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req)
+int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
+			  int timeout)
 {
-	struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
+	struct ubus_sync_req_cb cb;
+	ubus_complete_handler_t complete_cb = req->complete_cb;
+	bool registered = ctx->sock.registered;
+	int status = UBUS_STATUS_NO_DATA;
+
+	if (!registered) {
+		uloop_init();
+		ubus_add_uloop(ctx);
+	}
 
-	if (!list_empty(&req->list))
-		list_del(&req->list);
+	if (timeout) {
+		memset(&cb, 0, sizeof(cb));
+		cb.req = req;
+		cb.timeout.cb = ubus_sync_req_timeout_cb;
+		uloop_timeout_set(&cb.timeout, timeout);
+	}
 
-	while (1) {
-		if (req->status_msg)
-			return req->status_code;
+	ubus_complete_request_async(ctx, req);
+	req->complete_cb = ubus_sync_req_cb;
 
-		if (req->cancelled)
-			return UBUS_STATUS_NO_DATA;
+	ctx->stack_depth++;
+	while (!req->status_msg) {
+		bool cancelled = uloop_cancelled;
+		uloop_cancelled = false;
+		uloop_run();
+		uloop_cancelled = cancelled;
+	}
+	ctx->stack_depth--;
 
-		if (!get_next_msg(ctx, true))
-			return UBUS_STATUS_NO_DATA;
+	if (timeout)
+		uloop_timeout_cancel(&cb.timeout);
 
-		if (hdr->seq != req->seq || hdr->peer != req->peer)
-			goto skip;
+	if (req->status_msg)
+		status = req->status_code;
 
-		switch(hdr->type) {
-		case UBUS_MSG_STATUS:
-			return ubus_process_req_status(req, hdr);
-		case UBUS_MSG_DATA:
-			if (req->data_cb)
-				ubus_req_data(req, hdr);
-			continue;
-		default:
-			goto skip;
-		}
+	req->complete_cb = complete_cb;
+	if (req->complete_cb)
+		req->complete_cb(req, status);
 
-skip:
-		ubus_process_msg(ctx, hdr);
-	}
+	if (!registered)
+		uloop_fd_delete(&ctx->sock);
+
+	if (!ctx->stack_depth)
+		ubus_process_pending_invoke(ctx);
+
+	return status;
+}
+
+struct ubus_lookup_request {
+	struct ubus_request req;
+	ubus_lookup_handler_t cb;
+};
+
+static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg)
+{
+	struct ubus_lookup_request *req;
+	struct ubus_object_data obj;
+	struct blob_attr **attr;
+
+	req = container_of(ureq, struct ubus_lookup_request, req);
+	attr = ubus_parse_msg(msg);
+
+	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH] ||
+	    !attr[UBUS_ATTR_OBJTYPE])
+		return;
+
+	memset(&obj, 0, sizeof(obj));
+	obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
+	obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
+	obj.type_id = blob_get_u32(attr[UBUS_ATTR_OBJTYPE]);
+	obj.signature = attr[UBUS_ATTR_SIGNATURE];
+	req->cb(ureq->ctx, &obj, ureq->priv);
+}
+
+int __hidden 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));
+
+	if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN)
+		return -1;
+
+	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);
+}
+
+int ubus_lookup(struct ubus_context *ctx, const char *path,
+		ubus_lookup_handler_t cb, void *priv)
+{
+	struct ubus_lookup_request lookup;
+
+	blob_buf_init(&b, 0);
+	if (path)
+		blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+
+	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, 0);
+}
+
+static void ubus_lookup_id_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+	struct blob_attr **attr;
+	uint32_t *id = req->priv;
+
+	attr = ubus_parse_msg(msg);
+
+	if (!attr[UBUS_ATTR_OBJID])
+		return;
+
+	*id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
+}
+
+int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id)
+{
+	struct ubus_request req;
+
+	blob_buf_init(&b, 0);
+	if (path)
+		blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+
+	if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0) < 0)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	req.raw_data_cb = ubus_lookup_id_cb;
+	req.priv = id;
+
+	return ubus_complete_request(ctx, &req, 0);
+}
+
+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,
+int 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);
-	blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+	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);
+	if (ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	return 0;
 }
 
 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 blob_attr *msg, ubus_data_handler_t cb, void *priv,
+		int timeout)
 {
 	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);
+	return ubus_complete_request(ctx, &req, timeout);
 }
 
-static void ubus_publish_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_int32(attrbuf[UBUS_ATTR_OBJID]);
-
-	if (attrbuf[UBUS_ATTR_OBJTYPE])
-		obj->type->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJTYPE]);
+static int ubus_event_cb(struct ubus_context *ctx, struct ubus_object *obj,
+			 struct ubus_request_data *req,
+			 const char *method, struct blob_attr *msg)
+{
+	struct ubus_event_handler *ev;
 
-	obj->avl.key = &obj->id;
-	avl_insert(&req->ctx->objects, &obj->avl);
+	ev = container_of(obj, struct ubus_event_handler, obj);
+	ev->cb(ctx, ev, method, msg);
+	return 0;
 }
 
-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 const struct ubus_method event_method = {
+	.name = NULL,
+	.handler = ubus_event_cb,
+};
 
-static bool ubus_push_object_type(struct ubus_object_type *type)
+int ubus_register_event_handler(struct ubus_context *ctx,
+				struct ubus_event_handler *ev,
+				const char *pattern)
 {
-	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;
+	struct ubus_object *obj = &ev->obj;
+	struct blob_buf b2;
+	int ret;
 
-		m = blobmsg_open_table(&b, sig->name);
+	if (!obj->id) {
+		obj->methods = &event_method;
+		obj->n_methods = 1;
 
-		sig++;
-		rem--;
-		if (!ubus_push_table_data(&sig, &rem, false))
-			return false;
+		if (!!obj->name ^ !!obj->type)
+			return UBUS_STATUS_INVALID_ARGUMENT;
 
-		blobmsg_close_table(&b, m);
+		ret = ubus_add_object(ctx, obj);
+		if (ret)
+			return ret;
 	}
-	blob_nest_end(&b, s);
 
-	return true;
+	/* use a second buffer, ubus_invoke() overwrites the primary one */
+	memset(&b2, 0, sizeof(b2));
+	blob_buf_init(&b2, 0);
+	blobmsg_add_u32(&b2, "object", obj->id);
+	if (pattern)
+		blobmsg_add_string(&b2, "pattern", pattern);
+
+	return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+			  NULL, NULL, 0);
 }
 
-int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+int ubus_send_event(struct ubus_context *ctx, const char *id,
+		    struct blob_attr *data)
 {
 	struct ubus_request req;
-	int ret;
-
-	if (obj->id || !obj->name || !obj->type)
-		return UBUS_STATUS_INVALID_ARGUMENT;
+	void *s;
 
 	blob_buf_init(&b, 0);
-	blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name);
+	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 (obj->type->id)
-		blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id);
-	else if (!ubus_push_object_type(obj->type))
+	if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, UBUS_SYSTEM_OBJECT_EVENT) < 0)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	ubus_start_request(ctx, &req, b.head, UBUS_MSG_PUBLISH, 0);
-	req.data_cb = ubus_publish_cb;
-	req.priv = obj;
-	ret = ubus_complete_request(ctx, &req);
-	if (ret)
-		return ret;
-
-	if (!obj->id)
-		return UBUS_STATUS_NO_DATA;
-
-	return 0;
+	return ubus_complete_request(ctx, &req, 0);
 }
 
-void ubus_default_connection_lost(struct ubus_context *ctx)
+static void ubus_default_connection_lost(struct ubus_context *ctx)
 {
 	if (ctx->sock.registered)
 		uloop_end();
@@ -544,74 +545,24 @@ void ubus_default_connection_lost(struct ubus_context *ctx)
 struct ubus_context *ubus_connect(const char *path)
 {
 	struct ubus_context *ctx;
-	struct {
-		struct ubus_msghdr hdr;
-		struct blob_attr data;
-	} hdr;
-	struct blob_attr *buf;
-
-	if (!path)
-		path = UBUS_UNIX_SOCKET;
 
 	ctx = calloc(1, sizeof(*ctx));
 	if (!ctx)
-		goto error;
+		return NULL;
 
-	ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
-	if (ctx->sock.fd < 0) {
-		DPRINTF("Failed to connect to server\n");
-		goto error_free;
-	}
+	ctx->sock.fd = -1;
 	ctx->sock.cb = ubus_handle_data;
-
-	if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr)) {
-		DPRINTF("Failed to read initial message data\n");
-		goto error_close;
-	}
-
-	if (!ubus_validate_hdr(&hdr.hdr)) {
-		DPRINTF("Failed to validate initial message header\n");
-		goto error_close;
-	}
-
-	if (hdr.hdr.type != UBUS_MSG_HELLO) {
-		DPRINTF("Unexpected initial message\n");
-		goto error_close;
-	}
-
-	buf = calloc(1, blob_raw_len(&hdr.data));
-	if (!buf)
-		goto error_close;
-
-	memcpy(buf, &hdr.data, sizeof(hdr.data));
-	if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf)) {
-		DPRINTF("Failed to retrieve initial message data\n");
-		goto error_free_buf;
-	}
-
-	ctx->local_id = hdr.hdr.peer;
-	free(buf);
-
 	ctx->connection_lost = ubus_default_connection_lost;
 
 	INIT_LIST_HEAD(&ctx->requests);
+	INIT_LIST_HEAD(&ctx->pending);
 	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
-
-	if (!ctx->local_id) {
-		DPRINTF("Failed to get local peer id\n");
-		goto error_close;
+	if (ubus_reconnect(ctx, path)) {
+		free(ctx);
+		ctx = NULL;
 	}
 
 	return ctx;
-
-error_free_buf:
-	free(buf);
-error_close:
-	close(ctx->sock.fd);
-error_free:
-	free(ctx);
-error:
-	return NULL;
 }
 
 void ubus_free(struct ubus_context *ctx)