export the object type through lookup calls

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 2e2f0c6..8658118 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -6,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);
@@ -52,6 +53,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 +66,9 @@ struct ubus_object {
 
        const char *path;
        struct ubus_object_type *type;
+
+       const struct ubus_method *methods;
+       int n_methods;
 };
 
 struct ubus_context {
@@ -71,6 +80,8 @@ 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)];
@@ -95,6 +106,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;
 
@@ -142,4 +154,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);