X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=c93ad8f8a7541575681b6d92197f948accf99f9f;hp=2662878471a035ba8831c8eca20d63fd4f06ed9a;hb=659a98c8107d194f3ef6822dacc97e02e7c53e31;hpb=1a871e1e89055f8683793f1ca0d629ca2fa4d3be

diff --git a/libubus.h b/libubus.h
index 2662878..c93ad8f 100644
--- a/libubus.h
+++ b/libubus.h
@@ -6,12 +6,17 @@
 #include "ubusmsg.h"
 #include "ubus_common.h"
 
+struct ubus_context;
 struct ubus_msg_src;
 struct ubus_object;
 struct ubus_request;
 struct ubus_request_data;
+struct ubus_object_data;
 
-typedef int (*ubus_handler_t)(struct ubus_object *obj,
+typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx,
+				      struct ubus_object_data *obj,
+				      void *priv);
+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_data_handler_t)(struct ubus_request *req,
@@ -79,12 +84,21 @@ struct ubus_context {
 	uint32_t local_id;
 	uint32_t request_seq;
 
+	void (*connection_lost)(struct ubus_context *ctx);
+
 	struct {
 		struct ubus_msghdr hdr;
 		char data[UBUS_MAX_MSGLEN - sizeof(struct ubus_msghdr)];
 	} msgbuf;
 };
 
+struct ubus_object_data {
+	uint32_t id;
+	uint32_t type_id;
+	const char *path;
+	struct blob_attr *signature;
+};
+
 struct ubus_request_data {
 	uint32_t object;
 	uint32_t peer;
@@ -103,6 +117,7 @@ struct ubus_request {
 	uint32_t peer;
 	uint32_t seq;
 
+	ubus_data_handler_t raw_data_cb;
 	ubus_data_handler_t data_cb;
 	ubus_complete_handler_t complete_cb;
 
@@ -110,23 +125,19 @@ struct ubus_request {
 	void *priv;
 };
 
-#define BLOBMSG_END_TABLE	BLOBMSG_TYPE_UNSPEC
 
 struct ubus_context *ubus_connect(const char *path);
 void ubus_free(struct ubus_context *ctx);
 
 const char *ubus_strerror(int error);
 
-/* ----------- helpers for message handling ----------- */
-
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
+static inline void ubus_add_uloop(struct ubus_context *ctx)
+{
+	uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ);
+}
 
 /* ----------- raw request handling ----------- */
 
-/* start a raw request */
-int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
-		       struct blob_attr *msg, int cmd, uint32_t peer);
-
 /* wait for a request to complete and return its status */
 int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req);
 
@@ -137,6 +148,13 @@ void ubus_complete_request_async(struct ubus_context *ctx,
 /* abort an asynchronous request */
 void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req);
 
+/* ----------- objects ----------- */
+
+int ubus_lookup(struct ubus_context *ctx, const char *path,
+		ubus_lookup_handler_t cb, void *priv);
+
+int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id);
+
 /* ----------- rpc ----------- */
 
 /* invoke a method on a specific object */
@@ -150,4 +168,6 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho
 /* make an object visible to remote connections */
 int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj);
 
-
+/* send a reply to an incoming object method call */
+int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
+		    struct blob_attr *msg);