remove some duplication

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index 5fb565b..cdcc579 100644 (file)
--- 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;
 };
 
@@ -164,6 +164,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,17 +177,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_publish(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);
+}