};
enum {
+ RPC_D_CONFIG,
+ RPC_D_SECTION,
+ RPC_D_TYPE,
+ RPC_D_MATCH,
+ RPC_D_OPTION,
+ RPC_D_OPTIONS,
+ __RPC_D_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_delete_policy[__RPC_D_MAX] = {
+ [RPC_D_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
+ [RPC_D_SECTION] = { .name = "section", .type = BLOBMSG_TYPE_STRING },
+ [RPC_D_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
+ [RPC_D_MATCH] = { .name = "match", .type = BLOBMSG_TYPE_TABLE },
+ [RPC_D_OPTION] = { .name = "option", .type = BLOBMSG_TYPE_STRING },
+ [RPC_D_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_ARRAY },
+};
+
+enum {
RPC_R_CONFIG,
RPC_R_SECTION,
RPC_R_OPTION,
* corresponding section properties.
*/
static void
-rpc_uci_dump_section(struct uci_section *s, const char *name)
+rpc_uci_dump_section(struct uci_section *s, const char *name, int index)
{
void *c;
struct uci_option *o;
blobmsg_add_string(&buf, ".type", s->type);
blobmsg_add_string(&buf, ".name", s->e.name);
+ if (index >= 0)
+ blobmsg_add_u32(&buf, ".index", index);
+
uci_foreach_element(&s->options, e)
{
o = uci_to_option(e);
{
void *c;
struct uci_element *e;
+ int i = -1;
c = blobmsg_open_table(&buf, name);
uci_foreach_element(&p->sections, e)
{
+ i++;
+
if (!rpc_uci_match_section(uci_to_section(e), type, matches))
continue;
- rpc_uci_dump_section(uci_to_section(e), e->name);
+ rpc_uci_dump_section(uci_to_section(e), e->name, i);
}
blobmsg_close_table(&buf, c);
break;
case UCI_TYPE_SECTION:
- rpc_uci_dump_section(ptr.s, "values");
+ rpc_uci_dump_section(ptr.s, "values", -1);
break;
case UCI_TYPE_OPTION:
return rpc_uci_status();
}
+/*
+ * Delete option or section from uci specified by given blob attribute pointer
+ * 1) if the blob is of type array, delete any option named after each element
+ * 2) if the blob is of type string, delete the option named after its value
+ * 3) if the blob is NULL, delete entire section
+ */
+static void
+rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr)
+{
+ struct blob_attr *cur;
+ int rem;
+
+ if (rpc_uci_lookup(ptr) || !ptr->s)
+ return;
+
+ if (!opt)
+ {
+ ptr->o = NULL;
+ ptr->option = NULL;
+
+ uci_delete(cursor, ptr);
+ }
+ else if (blobmsg_type(opt) == BLOBMSG_TYPE_ARRAY)
+ {
+ blobmsg_for_each_attr(cur, opt, rem)
+ {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ continue;
+
+ ptr->o = NULL;
+ ptr->option = blobmsg_data(cur);
+
+ if (rpc_uci_lookup(ptr) || !ptr->o)
+ continue;
+
+ uci_delete(cursor, ptr);
+ }
+ }
+ else if (blobmsg_type(opt) == BLOBMSG_TYPE_STRING)
+ {
+ ptr->o = NULL;
+ ptr->option = blobmsg_data(opt);
+
+ if (rpc_uci_lookup(ptr) || !ptr->o)
+ return;
+
+ uci_delete(cursor, ptr);
+ }
+}
+
+static int
+rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct blob_attr *tb[__RPC_D_MAX];
+ struct uci_package *p = NULL;
+ struct uci_element *e, *tmp;
+ struct uci_ptr ptr = { 0 };
+
+ blobmsg_parse(rpc_uci_delete_policy, __RPC_D_MAX, tb,
+ blob_data(msg), blob_len(msg));
+
+ if (!tb[RPC_D_CONFIG] ||
+ (!tb[RPC_D_SECTION] && !tb[RPC_D_TYPE] && !tb[RPC_D_MATCH]))
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ ptr.package = blobmsg_data(tb[RPC_D_CONFIG]);
+ uci_load(cursor, ptr.package, &p);
+
+ if (!p)
+ goto out;
+
+ if (tb[RPC_D_SECTION])
+ {
+ ptr.section = blobmsg_data(tb[RPC_D_SECTION]);
+
+ if (tb[RPC_D_OPTIONS])
+ rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
+ else
+ rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
+ }
+ else
+ {
+ uci_foreach_element_safe(&p->sections, tmp, e)
+ {
+ if (!rpc_uci_match_section(uci_to_section(e),
+ tb[RPC_D_TYPE], tb[RPC_D_MATCH]))
+ continue;
+
+ ptr.s = NULL;
+ ptr.section = e->name;
+
+ if (tb[RPC_D_OPTIONS])
+ rpc_uci_merge_delete(tb[RPC_D_OPTIONS], &ptr);
+ else
+ rpc_uci_merge_delete(tb[RPC_D_OPTION], &ptr);
+ }
+ }
+
+ uci_save(cursor, p);
+
+out:
+ if (p)
+ uci_unload(cursor, p);
+
+ return rpc_uci_status();
+}
+
static int
rpc_uci_rename(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
return rpc_uci_revert_commit(msg, true);
}
+static int
+rpc_uci_configs(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ char **configs;
+ void *c;
+ int i;
+
+ if (uci_list_configs(cursor, &configs))
+ goto out;
+
+ blob_buf_init(&buf, 0);
+
+ c = blobmsg_open_array(&buf, "configs");
+
+ for (i = 0; configs[i]; i++)
+ blobmsg_add_string(&buf, NULL, configs[i]);
+
+ blobmsg_close_array(&buf, c);
+
+ ubus_send_reply(ctx, req, buf.head);
+
+out:
+ return rpc_uci_status();
+}
+
int rpc_uci_api_init(struct ubus_context *ctx)
{
static const struct ubus_method uci_methods[] = {
+ { .name = "configs", .handler = rpc_uci_configs },
UBUS_METHOD("get", rpc_uci_get, rpc_uci_get_policy),
UBUS_METHOD("add", rpc_uci_add, rpc_uci_add_policy),
UBUS_METHOD("set", rpc_uci_set, rpc_uci_set_policy),
+ UBUS_METHOD("delete", rpc_uci_delete, rpc_uci_delete_policy),
UBUS_METHOD("rename", rpc_uci_rename, rpc_uci_rename_policy),
UBUS_METHOD("order", rpc_uci_order, rpc_uci_order_policy),
UBUS_METHOD("changes", rpc_uci_changes, rpc_uci_config_policy),
projects / project / rpcd.git / blobdiff