enable -Wmissing-declarations

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 55c59e4..13e4c03 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -26,6 +26,7 @@ struct ubus_request;
 struct ubus_request_data;
 struct ubus_object_data;
 struct ubus_event_handler;
+struct ubus_watch_object;
 
 typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
                                      struct ubus_object_data *obj,
@@ -35,6 +36,8 @@ typedef int (*ubus_handler_t)(struct ubus_context *ctx, struct ubus_object *obj,
                              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_watch_handler_t)(struct ubus_context *ctx, struct ubus_watch_object *w,
+                                    uint32_t id);
 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);
@@ -84,6 +87,12 @@ struct ubus_object {
        int n_methods;
 };
 
+struct ubus_watch_object {
+       struct ubus_object obj;
+
+       ubus_watch_handler_t cb;
+};
+
 struct ubus_event_handler {
        struct ubus_object obj;
 
@@ -93,11 +102,13 @@ struct ubus_event_handler {
 struct ubus_context {
        struct list_head requests;
        struct avl_tree objects;
+       struct list_head pending;
 
        struct uloop_fd sock;
 
        uint32_t local_id;
        uint32_t request_seq;
+       int stack_depth;
 
        void (*connection_lost)(struct ubus_context *ctx);
 
@@ -148,7 +159,7 @@ const char *ubus_strerror(int error);
 
 static inline void ubus_add_uloop(struct ubus_context *ctx)
 {
-       uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ);
+       uloop_fd_add(&ctx->sock, ULOOP_BLOCKING | ULOOP_READ);
 }
 
 /* call this for read events on ctx->sock.fd when not using uloop */
@@ -183,6 +194,13 @@ int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj);
 /* remove the object from the ubus connection */
 int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj);
 
+/* add an object for watching other object state changes */
+int ubus_register_watch_object(struct ubus_context *ctx, struct ubus_watch_object *obj);
+
+int ubus_watch_object_add(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id);
+
+int ubus_watch_object_remove(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id);
+
 /* ----------- rpc ----------- */
 
 /* invoke a method on a specific object */