Rename ubus to uspc

src/vendor/ubus_req_handler.c

@@ -98,18 +98,16 @@ static char* get_internal_path(char *obj_name, char *path)
 
         if (path == NULL || strlen(path) == 0 || strcmp(path, "Device.") == 0 ||
 		strcmp(path, agent->prefix) == 0) {
-            snprintf(req_path, sizeof(req_path), "Device.SSH."); // TODO hack to shorten DM tree
+            snprintf(req_path, sizeof(req_path), "Device.");
 	    break;
 	}
 
         if (strstr(path, agent->prefix) == NULL && strstr(agent->prefix, path) != NULL) {
-            snprintf(req_path, sizeof(req_path), "Device.SSH."); // TODO hack to shorten DM tree
+            snprintf(req_path, sizeof(req_path), "Device.");
             break;
 	}
 
         snprintf(req_path, sizeof(req_path), "%s", path + strlen(agent->prefix));
-	if (strcmp(req_path, "Device.") == 0) // TODO hack to shorten DM tree
-		snprintf(req_path, sizeof(req_path), "Device.SSH.");
 	break;
     default:
         break;
@@ -1094,7 +1092,7 @@ int register_ubus_objects(struct ubus_context *ubus_ctx)
         return -1;
     }
 
-    if (uci_load(ctx, "obuspc", &pkg)) {
+    if (uci_load(ctx, "uspc", &pkg)) {
         uci_free_context(ctx);
         USP_LOG_Error("Failed to load uci");
         return -1;
@@ -1137,7 +1135,7 @@ int register_ubus_objects(struct ubus_context *ubus_ctx)
             snprintf(pref_path, sizeof(pref_path), "%s", prefix);
 
         char name[30] = {0};
-	snprintf(name, sizeof(name), "obuspc.proxy_%d", proxy_id);
+	snprintf(name, sizeof(name), "uspc.proxy_%d", proxy_id);
 	proxy_id = proxy_id + 1;
 
         agent_node_t *new_agent = malloc(sizeof(agent_node_t));

src/vendor/vendor_utils.c

@@ -195,7 +195,7 @@ int uci_get_value_by_path(struct uci_context *ctx, char *path, char **value)
 int obuspc_uci_add_section(struct uci_context *ctx, char *stype, struct uci_section **s)
 {
     struct uci_ptr ptr = {0};
-    char *fname = "/etc/config/obuspc";
+    char *fname = "/etc/config/uspc";
 
     *s = NULL;
 
@@ -211,7 +211,7 @@ int obuspc_uci_add_section(struct uci_context *ctx, char *stype, struct uci_sect
     }
 
     ptr.value = NULL;
-    ptr.package = "obuspc";
+    ptr.package = "uspc";
     ptr.target = UCI_TYPE_PACKAGE;
 
     if (uci_lookup_ptr(ctx, &ptr, NULL, true) == UCI_OK
@@ -254,7 +254,7 @@ int obuspc_uci_set_value(struct uci_context *ctx, char *section, char *option, c
         return -1;
 
     ptr.value = value;
-    ptr.package = "obuspc";
+    ptr.package = "uspc";
     ptr.section = section;
     ptr.option = option;
     ptr.target = UCI_TYPE_OPTION;
@@ -276,7 +276,7 @@ void reload_obuspc(void)
     struct blob_buf b;
     memset(&b, 0, sizeof(struct blob_buf));
     blob_buf_init(&b, 0);
-    blobmsg_add_string(&b, "config", "obuspc");
+    blobmsg_add_string(&b, "config", "uspc");
     uint32_t id;
     struct ubus_context *ubus_ctx = ubus_connect(NULL);
     if (!ubus_ctx) {
@@ -295,7 +295,7 @@ static int obuspc_commit_package(struct uci_context *ctx)
 {
     struct uci_ptr ptr = {0};
 
-    if (uci_lookup_ptr(ctx, &ptr, "obuspc", true) != UCI_OK)
+    if (uci_lookup_ptr(ctx, &ptr, "uspc", true) != UCI_OK)
         return -1;
 
     if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
@@ -331,7 +331,7 @@ void onboard_agent(char *endpoint_id)
 
     uci_set_confdir(ctx, "/etc/config");
 
-    if (uci_load(ctx, "obuspc", &pkg)) {
+    if (uci_load(ctx, "uspc", &pkg)) {
         uci_free_context(ctx);
         return;
     }
@@ -346,7 +346,7 @@ void onboard_agent(char *endpoint_id)
 
         char path[1024] = {0};
         char *value = NULL;
-        snprintf(path, sizeof(path), "obuspc.%s.EndpointID", s->e.name);
+        snprintf(path, sizeof(path), "uspc.%s.EndpointID", s->e.name);
         if (0 != uci_get_value_by_path(ctx, path, &value))
             continue;