add support for data replies

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 3da5d21..8658118 100644 (file)
--- 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,15 @@
 #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);
+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,24 +53,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,13 +101,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;
 };
 
@@ -130,16 +146,14 @@ 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);
 
-
+/* 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);