rename publish to add_object

diff --git a/libubus.c b/libubus.c
index 8749d7ca0d7d35c57c20dccef9b6fbd7e55598d7..d799c1dedc11301f8e9c6fb711809bc6b11d723c 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -533,7 +533,7 @@ int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
        return ubus_complete_request(ctx, &req);
 }
 
-static void ubus_publish_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
 {
        struct ubus_object *obj = req->priv;
 
@@ -609,7 +609,7 @@ static bool ubus_push_object_type(struct ubus_object_type *type)
        return true;
 }
 
-static int __ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+static int __ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
 {
        struct ubus_request req;
        int ret;
@@ -625,8 +625,8 @@ static int __ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
                        return UBUS_STATUS_INVALID_ARGUMENT;
        }
 
-       ubus_start_request(ctx, &req, b.head, UBUS_MSG_PUBLISH, 0);
-       req.raw_data_cb = ubus_publish_cb;
+       ubus_start_request(ctx, &req, b.head, UBUS_MSG_ADD_OBJECT, 0);
+       req.raw_data_cb = ubus_add_object_cb;
        req.priv = obj;
        ret = ubus_complete_request(ctx, &req);
        if (ret)
@@ -638,12 +638,12 @@ static int __ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
        return 0;
 }
 
-int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
 {
        if (!obj->name || !obj->type)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       return __ubus_publish(ctx, obj);
+       return __ubus_add_object(ctx, obj);
 }
 
 static int ubus_event_cb(struct ubus_context *ctx, struct ubus_object *obj,
@@ -677,7 +677,7 @@ int ubus_register_event_handler(struct ubus_context *ctx,
                if (!!obj->name ^ !!obj->type)
                        return UBUS_STATUS_INVALID_ARGUMENT;
 
-               ret = __ubus_publish(ctx, obj);
+               ret = __ubus_add_object(ctx, obj);
                if (ret)
                        return ret;
        }

diff --git a/libubus.h b/libubus.h
index 5fb565be1b47330cefdc0c66d1d8c62699098350..bab919ff5ff39d9a1beead60e09a10e59e0e763d 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -175,7 +175,7 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho
                        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_add_object(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,

diff --git a/ubus-example.c b/ubus-example.c
index 298a7dd1386db620990a3b262d369c2c9193e9fd..9e1b1d91b6bfebaf093765e15dd6428bc01b0dde 100644 (file)
--- a/ubus-example.c
+++ b/ubus-example.c
@@ -98,18 +98,18 @@ int main(int argc, char **argv)
        fprintf(stderr, "Connected as ID 0x%08x\n", ctx->local_id);
 
        fprintf(stderr, "Publishing object\n");
-       ret = ubus_publish(ctx, &test_object);
+       ret = ubus_add_object(ctx, &test_object);
        if (ret)
-               fprintf(stderr, "Failed to publish object: %s\n", ubus_strerror(ret));
+               fprintf(stderr, "Failed to add_object object: %s\n", ubus_strerror(ret));
        else {
                fprintf(stderr, "Object ID: %08x\n", test_object.id);
                fprintf(stderr, "Object Type ID: %08x\n", test_object.type->id);
        }
 
        fprintf(stderr, "Publishing object\n");
-       ret = ubus_publish(ctx, &test_object2);
+       ret = ubus_add_object(ctx, &test_object2);
        if (ret)
-               fprintf(stderr, "Failed to publish object: %s\n", ubus_strerror(ret));
+               fprintf(stderr, "Failed to add_object object: %s\n", ubus_strerror(ret));
        else {
                fprintf(stderr, "Object ID: %08x\n", test_object2.id);
                fprintf(stderr, "Object Type ID: %08x\n", test_object2.type->id);

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 3333330be3a04e92150d6a0d99810c08602818ed..550e11631706faad6651bf31d267c0e4b09dcf34 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -69,7 +69,7 @@ static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        return 0;
 }
 
-static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        struct ubus_object *obj;
 
@@ -231,7 +231,7 @@ error:
 
 static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
        [UBUS_MSG_PING] = ubusd_send_pong,
-       [UBUS_MSG_PUBLISH] = ubusd_handle_publish,
+       [UBUS_MSG_ADD_OBJECT] = ubusd_handle_add_object,
        [UBUS_MSG_LOOKUP] = ubusd_handle_lookup,
        [UBUS_MSG_INVOKE] = ubusd_handle_invoke,
        [UBUS_MSG_STATUS] = ubusd_handle_response,

diff --git a/ubusmsg.h b/ubusmsg.h
index 32cee6bb501eb311770ffc1f312b91d13b50f879..116351d4ec2d3739a74251548a11d6d501cd3f03 100644 (file)
--- a/ubusmsg.h
+++ b/ubusmsg.h
@@ -38,8 +38,8 @@ enum ubus_msg_type {
        /* invoke a method on a single object */
        UBUS_MSG_INVOKE,
 
-       /* publish an object */
-       UBUS_MSG_PUBLISH,
+       UBUS_MSG_ADD_OBJECT,
+       UBUS_MSG_REMOVE_OBJECT,
 
        /* must be last */
        __UBUS_MSG_LAST,