listener: add a more complex example using parsing

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 8658118..5fb565b 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -11,10 +11,17 @@ struct ubus_msg_src;
 struct ubus_object;
 struct ubus_request;
 struct ubus_request_data;
+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);
@@ -71,6 +78,12 @@ struct ubus_object {
        int n_methods;
 };
 
+struct ubus_event_handler {
+       struct ubus_object obj;
+
+       ubus_event_handler_t cb;
+};
+
 struct ubus_context {
        struct list_head requests;
        struct avl_tree objects;
@@ -88,6 +101,13 @@ struct ubus_context {
        } 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;
@@ -114,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);
 
@@ -141,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 */
@@ -157,3 +180,8 @@ 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);
+
+/* ----------- events ----------- */
+int ubus_register_event_handler(struct ubus_context *ctx,
+                               struct ubus_event_handler *ev,
+                               const char *pattern);