ubus: Correct usage of timeout on poll function

[project/ubus.git] / ubusd_obj.h

diff --git a/ubusd_obj.h b/ubusd_obj.h
index 5a82e8d..5ed5ba8 100644 (file)
--- a/ubusd_obj.h
+++ b/ubusd_obj.h
@@ -38,7 +38,6 @@ struct ubus_method {
 struct ubus_subscription {
        struct list_head list, target_list;
        struct ubus_object *subscriber, *target;
-       char method[];
 };
 
 struct ubus_object {
@@ -53,7 +52,8 @@ struct ubus_object {
        struct avl_node path;
 
        struct ubus_client *client;
-       int (*recv_msg)(struct ubus_client *client, const char *method, struct blob_attr *msg);
+       int (*recv_msg)(struct ubus_client *client, struct ubus_msg_buf *ub,
+                       const char *method, struct blob_attr *msg);
 
        int event_seen;
        unsigned int invoke_seq;
@@ -76,8 +76,9 @@ static inline struct ubus_object *ubusd_find_object(uint32_t objid)
        return obj;
 }
 
-void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const char *method);
+void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target);
 void ubus_unsubscribe(struct ubus_subscription *s);
 void ubus_notify_unsubscribe(struct ubus_subscription *s);
+void ubus_notify_subscription(struct ubus_object *obj);
 
 #endif