X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=698e356513c3ac5e406ac0539e28d82ba328f5b5;hp=bd3d736efd0578ab928c16d34ca259acb82b3ac2;hb=ea76fb270d40e11f3c4b02671babc47ffe836646;hpb=dbd4c2f121be08e514828f2533687b145a6e16dd

diff --git a/libubus.h b/libubus.h
index bd3d736..698e356 100644
--- a/libubus.h
+++ b/libubus.h
@@ -1,3 +1,4 @@
+#include <libubox/avl.h>
 #include <libubox/list.h>
 #include <libubox/blobmsg.h>
 #include <libubox/uloop.h>
@@ -5,14 +6,19 @@
 #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;
+
+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_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);
@@ -51,30 +57,48 @@ 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;
+
 	const char *name;
 	uint32_t id;
 
 	const char *path;
-	struct ubus_object *parent;
-
 	struct ubus_object_type *type;
+
+	const struct ubus_method *methods;
+	int n_methods;
 };
 
 struct ubus_context {
 	struct list_head requests;
-	struct list_head objects;
+	struct avl_tree objects;
+
 	struct uloop_fd sock;
 
 	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;
@@ -88,13 +112,16 @@ struct ubus_request {
 	bool status_msg;
 	int status_code;
 	bool blocked;
+	bool cancelled;
 
 	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;
 
+	struct ubus_context *ctx;
 	void *priv;
 };
 
@@ -105,16 +132,8 @@ 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);
-
 /* ----------- 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);
 
@@ -125,6 +144,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 */
@@ -138,4 +164,6 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho
 /* make an object visible to remote connections */
 int ubus_publish(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);