ubusd: fix id lookup of objects with path and no methods

[project/ubus.git] / ubusd_obj.h

diff --git a/ubusd_obj.h b/ubusd_obj.h
index 3fc4937..5ed5ba8 100644 (file)
--- a/ubusd_obj.h
+++ b/ubusd_obj.h
@@ -1,3 +1,16 @@
+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #ifndef __UBUSD_OBJ_H
 #define __UBUSD_OBJ_H
 
@@ -22,19 +35,28 @@ struct ubus_method {
        struct blob_attr data[];
 };
 
+struct ubus_subscription {
+       struct list_head list, target_list;
+       struct ubus_object *subscriber, *target;
+};
+
 struct ubus_object {
        struct ubus_id id;
        struct list_head list;
 
        struct list_head events;
 
+       struct list_head subscribers, target_list;
+
        struct ubus_object_type *type;
        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;
 };
 
 struct ubus_object *ubusd_create_object(struct ubus_client *cl, struct blob_attr **attr);
@@ -54,4 +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);
+void ubus_unsubscribe(struct ubus_subscription *s);
+void ubus_notify_unsubscribe(struct ubus_subscription *s);
+void ubus_notify_subscription(struct ubus_object *obj);
+
 #endif