X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libubus.h;h=9e78ad43ebaf03efa52b5bbcaa86de981578d644;hb=ef978a8ea002a146d8a6d60a9f0458b272f912eb;hp=6ca7d9df79e493028d9e736942fca314056eaa89;hpb=d2f1a01d9f6b49d7353dc848018c176400091741;p=project%2Fubus.git

diff --git a/libubus.h b/libubus.h
index 6ca7d9d..9e78ad4 100644
--- a/libubus.h
+++ b/libubus.h
@@ -97,7 +97,7 @@ struct ubus_context {
 
 	struct {
 		struct ubus_msghdr hdr;
-		char data[UBUS_MAX_MSGLEN - sizeof(struct ubus_msghdr)];
+		char data[UBUS_MAX_MSGLEN];
 	} msgbuf;
 };
 
@@ -145,6 +145,12 @@ static inline void ubus_add_uloop(struct ubus_context *ctx)
 	uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ);
 }
 
+/* call this for read events on ctx->sock.fd when not using uloop */
+static inline void ubus_handle_event(struct ubus_context *ctx)
+{
+	ctx->sock.cb(&ctx->sock, ULOOP_READ);
+}
+
 /* ----------- raw request handling ----------- */
 
 /* wait for a request to complete and return its status */
@@ -164,6 +170,12 @@ int ubus_lookup(struct ubus_context *ctx, const char *path,
 
 int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id);
 
+/* make an object visible to remote connections */
+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);
+
 /* ----------- rpc ----------- */
 
 /* invoke a method on a specific object */
@@ -171,20 +183,24 @@ int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
                 struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
 
 /* asynchronous version of ubus_invoke() */
-void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
-                       struct blob_attr *msg, struct ubus_request *req);
-
-/* make an object visible to remote connections */
-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);
+int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
+                      struct blob_attr *msg, struct ubus_request *req);
 
 /* 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);
 
 /* ----------- events ----------- */
+
+int ubus_send_event(struct ubus_context *ctx, const char *id,
+		    struct blob_attr *data);
+
 int ubus_register_event_handler(struct ubus_context *ctx,
 				struct ubus_event_handler *ev,
 				const char *pattern);
+
+static inline int ubus_unregister_event_handler(struct ubus_context *ctx,
+						struct ubus_event_handler *ev)
+{
+    return ubus_remove_object(ctx, &ev->obj);
+}