treewide: adjust ubus object type names

Drop the historically inherited "luci-rpc-" prefix and replace it with a
more appropriate "rpcd-plugin-" string.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/file.c b/file.c
index bd7af5695e4554d8cd02320e6a3cd5644754b3d9..07b4d3cf17a50a60ab1bc38d86adf5e4374d15cd 100644 (file)
--- a/file.c
+++ b/file.c
@@ -996,7 +996,7 @@ rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
        };
 
        static struct ubus_object_type file_type =
-               UBUS_OBJECT_TYPE("luci-rpc-file", file_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-file", file_methods);
 
        static struct ubus_object obj = {
                .name = "file",

diff --git a/iwinfo.c b/iwinfo.c
index ba4fc1e4385334216e969d4d4568b5b688b478e1..6c0319e5c7fe46b03dd7aebb15c31b7e0d694a02 100644 (file)
--- a/iwinfo.c
+++ b/iwinfo.c
@@ -975,7 +975,7 @@ rpc_iwinfo_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
        };
 
        static struct ubus_object_type iwinfo_type =
-               UBUS_OBJECT_TYPE("luci-rpc-iwinfo", iwinfo_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-iwinfo", iwinfo_methods);
 
        static struct ubus_object obj = {
                .name = "iwinfo",

diff --git a/plugin.c b/plugin.c
index b0315dc15836f6f2b4972ff681adce09eb6b7bec..73b6c653106b1fcf6a636e50380e221b57cca098 100644 (file)
--- a/plugin.c
+++ b/plugin.c
@@ -395,7 +395,7 @@ rpc_plugin_parse_exec(const char *name, int fd)
                return NULL;
        }
 
-       if (asprintf((char **)&obj_type->name, "luci-rpc-plugin-%s", name) < 0) {
+       if (asprintf((char **)&obj_type->name, "rpcd-plugin-exec-%s", name) < 0) {
                free(obj);
                free(obj_type);
                return NULL;

diff --git a/session.c b/session.c
index a11e3ab524345c60dbf0fb938e53216efc28df41..c7d9f3202e6beba81e43ccaff2a7f8e3ba18c3bb 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1332,7 +1332,7 @@ int rpc_session_api_init(struct ubus_context *ctx)
        };
 
        static struct ubus_object_type session_type =
-               UBUS_OBJECT_TYPE("luci-rpc-session", session_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-session", session_methods);
 
        static struct ubus_object obj = {
                .name = "session",

diff --git a/sys.c b/sys.c
index 69daa1b02aeb343646202265bd0316abd70f010c..097e7057f7daad2208a6a24f07132ebff39c66a8 100644 (file)
--- a/sys.c
+++ b/sys.c
@@ -355,7 +355,7 @@ rpc_sys_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
        };
 
        static struct ubus_object_type sys_type =
-               UBUS_OBJECT_TYPE("luci-rpc-sys", sys_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-sys", sys_methods);
 
        static struct ubus_object obj = {
                .name = "rpc-sys",

diff --git a/uci.c b/uci.c
index e2394334134482ec4da993ede5e0334d8d32b14d..3cd2b829efd055e3096da1499fbf2e70f5f1850b 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -1778,7 +1778,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
        };
 
        static struct ubus_object_type uci_type =
-               UBUS_OBJECT_TYPE("luci-rpc-uci", uci_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-uci", uci_methods);
 
        static struct ubus_object obj = {
                .name = "uci",