X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=a120eb6d9f419dd99702cd56030af254393a73db;hp=59d981e7141ec6b80ecb63bce52a7729833d15ea;hb=62cdfc3d16f815e24b9c62eb9a3bacd9aa8f621a;hpb=7864896a1bfbc27764de4c13ff7dfa762e4b71c7

diff --git a/libubus.h b/libubus.h
index 59d981e..a120eb6 100644
--- a/libubus.h
+++ b/libubus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2011-2012 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
@@ -22,6 +22,8 @@
 #include "ubusmsg.h"
 #include "ubus_common.h"
 
+#define UBUS_MAX_NOTIFY_PEERS	16
+
 struct ubus_context;
 struct ubus_msg_src;
 struct ubus_object;
@@ -29,7 +31,8 @@ struct ubus_request;
 struct ubus_request_data;
 struct ubus_object_data;
 struct ubus_event_handler;
-struct ubus_watch_object;
+struct ubus_subscriber;
+struct ubus_notify_request;
 
 typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
 				      struct ubus_object_data *obj,
@@ -37,13 +40,16 @@ typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
 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_state_handler_t)(struct ubus_context *ctx, struct ubus_object *obj);
+typedef void (*ubus_remove_handler_t)(struct ubus_context *ctx,
+				      struct ubus_subscriber *obj, uint32_t id);
 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);
+typedef void (*ubus_notify_complete_handler_t)(struct ubus_notify_request *req,
+					       int idx, int ret);
 
 #define UBUS_OBJECT_TYPE(_name, _methods)		\
 	{						\
@@ -86,14 +92,18 @@ struct ubus_object {
 	const char *path;
 	struct ubus_object_type *type;
 
+	ubus_state_handler_t subscribe_cb;
+	bool has_subscribers;
+
 	const struct ubus_method *methods;
 	int n_methods;
 };
 
-struct ubus_watch_object {
+struct ubus_subscriber {
 	struct ubus_object obj;
 
-	ubus_watch_handler_t cb;
+	ubus_handler_t cb;
+	ubus_remove_handler_t remove_cb;
 };
 
 struct ubus_event_handler {
@@ -110,7 +120,7 @@ struct ubus_context {
 	struct uloop_fd sock;
 
 	uint32_t local_id;
-	uint32_t request_seq;
+	uint16_t request_seq;
 	int stack_depth;
 
 	void (*connection_lost)(struct ubus_context *ctx);
@@ -131,7 +141,7 @@ struct ubus_object_data {
 struct ubus_request_data {
 	uint32_t object;
 	uint32_t peer;
-	uint32_t seq;
+	uint16_t seq;
 	bool deferred;
 };
 
@@ -139,13 +149,14 @@ struct ubus_request {
 	struct list_head list;
 
 	struct list_head pending;
-	bool status_msg;
 	int status_code;
+	bool status_msg;
 	bool blocked;
 	bool cancelled;
+	bool notify;
 
 	uint32_t peer;
-	uint32_t seq;
+	uint16_t seq;
 
 	ubus_data_handler_t raw_data_cb;
 	ubus_data_handler_t data_cb;
@@ -155,6 +166,15 @@ struct ubus_request {
 	void *priv;
 };
 
+struct ubus_notify_request {
+	struct ubus_request req;
+
+	ubus_notify_complete_handler_t status_cb;
+	ubus_notify_complete_handler_t complete_cb;
+
+	uint32_t pending;
+	uint32_t id[UBUS_MAX_NOTIFY_PEERS + 1];
+};
 
 struct ubus_context *ubus_connect(const char *path);
 int ubus_reconnect(struct ubus_context *ctx, const char *path);
@@ -199,12 +219,10 @@ 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);
+/* add a subscriber notifications from another object */
+int ubus_register_subscriber(struct ubus_context *ctx, struct ubus_subscriber *obj);
+int ubus_subscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id);
+int ubus_unsubscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id);
 
 /* ----------- rpc ----------- */
 
@@ -232,6 +250,18 @@ static inline void ubus_defer_request(struct ubus_context *ctx,
 void ubus_complete_deferred_request(struct ubus_context *ctx,
 				    struct ubus_request_data *req, int ret);
 
+/*
+ * send a notification to all subscribers of an object
+ * if timeout < 0, no reply is expected from subscribers
+ */
+int ubus_notify(struct ubus_context *ctx, struct ubus_object *obj,
+		const char *type, struct blob_attr *msg, int timeout);
+
+int ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
+		      const char *type, struct blob_attr *msg,
+		      struct ubus_notify_request *req);
+
+
 /* ----------- events ----------- */
 
 int ubus_send_event(struct ubus_context *ctx, const char *id,