X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=6ca7d9df79e493028d9e736942fca314056eaa89;hp=2e2f0c67576225ee9bfef3a1c9e7f16f83140bce;hb=d2f1a01d9f6b49d7353dc848018c176400091741;hpb=44096a0a342c773bf661f64d37d7c08fc96a68f8

diff --git a/libubus.h b/libubus.h
index 2e2f0c6..6ca7d9d 100644
--- a/libubus.h
+++ b/libubus.h
@@ -6,14 +6,22 @@
 #include "ubusmsg.h"
 #include "ubus_common.h"
 
+struct ubus_context;
 struct ubus_msg_src;
 struct ubus_object;
 struct ubus_request;
 struct ubus_request_data;
-
-typedef void (*ubus_handler_t)(struct ubus_object *obj,
-			       struct ubus_request_data *req,
-			       const char *method, struct blob_attr *msg);
+struct ubus_object_data;
+struct ubus_event_handler;
+
+typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
+				      struct ubus_object_data *obj,
+				      void *priv);
+typedef int (*ubus_handler_t)(struct ubus_context *ctx, struct ubus_object *obj,
+			      struct ubus_request_data *req,
+			      const char *method, struct blob_attr *msg);
+typedef void (*ubus_event_handler_t)(struct ubus_context *ctx, struct ubus_event_handler *ev,
+				     const char *type, struct blob_attr *msg);
 typedef void (*ubus_data_handler_t)(struct ubus_request *req,
 				    int type, struct blob_attr *msg);
 typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret);
@@ -52,6 +60,11 @@ struct ubus_object_type {
 	const struct ubus_signature *signature;
 };
 
+struct ubus_method {
+	const char *name;
+	ubus_handler_t handler;
+};
+
 struct ubus_object {
 	struct avl_node avl;
 
@@ -60,6 +73,15 @@ struct ubus_object {
 
 	const char *path;
 	struct ubus_object_type *type;
+
+	const struct ubus_method *methods;
+	int n_methods;
+};
+
+struct ubus_event_handler {
+	struct ubus_object obj;
+
+	ubus_event_handler_t cb;
 };
 
 struct ubus_context {
@@ -71,12 +93,21 @@ struct ubus_context {
 	uint32_t local_id;
 	uint32_t request_seq;
 
+	void (*connection_lost)(struct ubus_context *ctx);
+
 	struct {
 		struct ubus_msghdr hdr;
 		char data[UBUS_MAX_MSGLEN - sizeof(struct ubus_msghdr)];
 	} msgbuf;
 };
 
+struct ubus_object_data {
+	uint32_t id;
+	uint32_t type_id;
+	const char *path;
+	struct blob_attr *signature;
+};
+
 struct ubus_request_data {
 	uint32_t object;
 	uint32_t peer;
@@ -95,6 +126,7 @@ struct ubus_request {
 	uint32_t peer;
 	uint32_t seq;
 
+	ubus_data_handler_t raw_data_cb;
 	ubus_data_handler_t data_cb;
 	ubus_complete_handler_t complete_cb;
 
@@ -102,23 +134,19 @@ struct ubus_request {
 	void *priv;
 };
 
-#define BLOBMSG_END_TABLE	BLOBMSG_TYPE_UNSPEC
 
 struct ubus_context *ubus_connect(const char *path);
 void ubus_free(struct ubus_context *ctx);
 
 const char *ubus_strerror(int error);
 
-/* ----------- helpers for message handling ----------- */
-
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
+static inline void ubus_add_uloop(struct ubus_context *ctx)
+{
+	uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ);
+}
 
 /* ----------- raw request handling ----------- */
 
-/* start a raw request */
-int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
-		       struct blob_attr *msg, int cmd, uint32_t peer);
-
 /* wait for a request to complete and return its status */
 int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req);
 
@@ -129,6 +157,13 @@ void ubus_complete_request_async(struct ubus_context *ctx,
 /* abort an asynchronous request */
 void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req);
 
+/* ----------- objects ----------- */
+
+int ubus_lookup(struct ubus_context *ctx, const char *path,
+		ubus_lookup_handler_t cb, void *priv);
+
+int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id);
+
 /* ----------- rpc ----------- */
 
 /* invoke a method on a specific object */
@@ -140,6 +175,16 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho
                        struct blob_attr *msg, struct ubus_request *req);
 
 /* make an object visible to remote connections */
-int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj);
+int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj);
+
+/* remove the object from the ubus connection */
+int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj);
 
+/* send a reply to an incoming object method call */
+int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
+		    struct blob_attr *msg);
 
+/* ----------- events ----------- */
+int ubus_register_event_handler(struct ubus_context *ctx,
+				struct ubus_event_handler *ev,
+				const char *pattern);