X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=0c97436df6e9a3c514a0200d6aa85c63b208d9e8;hp=a120eb6d9f419dd99702cd56030af254393a73db;hb=29d7092252a10c11ac137e38c871e301e26a8c11;hpb=3642af8097bf546fc7ce476a730e1187a35a3942

diff --git a/libubus.h b/libubus.h
index a120eb6..0c97436 100644
--- a/libubus.h
+++ b/libubus.h
@@ -34,6 +34,12 @@ struct ubus_event_handler;
 struct ubus_subscriber;
 struct ubus_notify_request;
 
+static inline struct blob_attr *
+ubus_msghdr_data(struct ubus_msghdr *hdr)
+{
+	return (struct blob_attr *) (hdr + 1);
+}
+
 typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
 				      struct ubus_object_data *obj,
 				      void *priv);
@@ -50,6 +56,7 @@ typedef void (*ubus_data_handler_t)(struct ubus_request *req,
 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);
+typedef void (*ubus_connect_handler_t)(struct ubus_context *ctx);
 
 #define UBUS_OBJECT_TYPE(_name, _methods)		\
 	{						\
@@ -67,6 +74,12 @@ typedef void (*ubus_notify_complete_handler_t)(struct ubus_notify_request *req,
 		.n_policy = ARRAY_SIZE(_policy)		\
 	}
 
+#define UBUS_METHOD_NOARG(_name, _handler)		\
+	{						\
+		.name = _name,				\
+		.handler = _handler,			\
+	}
+
 struct ubus_method {
 	const char *name;
 	ubus_handler_t handler;
@@ -176,7 +189,15 @@ struct ubus_notify_request {
 	uint32_t id[UBUS_MAX_NOTIFY_PEERS + 1];
 };
 
+struct ubus_auto_conn {
+	struct ubus_context ctx;
+	struct uloop_timeout timer;
+	const char *path;
+	ubus_connect_handler_t cb;
+};
+
 struct ubus_context *ubus_connect(const char *path);
+void ubus_auto_connect(struct ubus_auto_conn *conn);
 int ubus_reconnect(struct ubus_context *ctx, const char *path);
 void ubus_free(struct ubus_context *ctx);
 
@@ -221,6 +242,13 @@ int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj);
 
 /* add a subscriber notifications from another object */
 int ubus_register_subscriber(struct ubus_context *ctx, struct ubus_subscriber *obj);
+
+static inline int
+ubus_unregister_subscriber(struct ubus_context *ctx, struct ubus_subscriber *obj)
+{
+	return ubus_remove_object(ctx, &obj->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);