X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=b741e652916e7b0488b0da6f9ae8b82e0cbd08a2;hp=3da5d21d6f4ce8fe63c4216fb846be78e97d7986;hb=a03acea49cb86f708d398bdd1daeda99ee0152c2;hpb=8321f8c523c9bf5f476f9c5b06c955d0ce3a0f80

diff --git a/libubus.h b/libubus.h
index 3da5d21..b741e65 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>
@@ -10,9 +11,9 @@ 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);
+typedef int (*ubus_handler_t)(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,24 +52,35 @@ 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)];
@@ -88,6 +100,7 @@ struct ubus_request {
 	bool status_msg;
 	int status_code;
 	bool blocked;
+	bool cancelled;
 
 	uint32_t peer;
 	uint32_t seq;
@@ -95,6 +108,7 @@ struct ubus_request {
 	ubus_data_handler_t data_cb;
 	ubus_complete_handler_t complete_cb;
 
+	struct ubus_context *ctx;
 	void *priv;
 };
 
@@ -130,14 +144,10 @@ void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req);
 /* invoke a method on a specific object */
 int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
                 struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
-int ubus_invoke_path(struct ubus_context *ctx, const char *path, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
 
 /* asynchronous version of ubus_invoke() */
 void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
                        struct blob_attr *msg, struct ubus_request *req);
-void ubus_invoke_path_async(struct ubus_context *ctx, const char *path, const char *method,
-                       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);