Hi,
SoB is missing and ....
On 02/09/2015 02:14, Alexander Couzens wrote:
> similiar to import from uci cli.
> import removes all old configs and import the new config.
>
> example:
> ubus call uci import \
> '{"config": "dhcp", "values": { "srv": { ".type": "host", ".name": "srv",
> "mac": "00:11:22:33:44:55", "ip": "192.168.1.2" } } }'
> ---
> uci.c | 152
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 152 insertions(+)
>
> changelog:
> - cleanup whitespace/tab indention
> - add {} around to make it more readable
> - implement same coding style than file.c
>
> diff --git a/uci.c b/uci.c
> index 8b5dafd..c59f24d 100644
> --- a/uci.c
> +++ b/uci.c
> */
> @@ -659,8 +691,10 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object
> *obj,
> {
> case BLOBMSG_TYPE_ARRAY:
> blobmsg_for_each_attr(elem, cur, rem2)
> + {
> if (rpc_uci_format_blob(elem,
> &ptr.value))
> uci_add_list(cursor, &ptr);
> + }
> break;
>
.. this is either unrelated or important, so please remove or explain it
John
> default:
> @@ -729,6 +763,123 @@ rpc_uci_merge_set(struct blob_attr *opt, struct uci_ptr
> *ptr)
> }
>
> static int
> +rpc_uci_add_section(struct uci_package *p, struct blob_attr *msg)
> +{
> + struct uci_section *s;
> + struct uci_ptr ptr = { 0 };
> + struct blob_attr *cur, *elem;
> + struct blob_attr *tb[__RPC_ADD_MAX];
> + int rem, rem2;
> +
> + blobmsg_parse(rpc_uci_add_section_policy, __RPC_ADD_MAX, tb,
> + blobmsg_data(msg), blobmsg_len(msg));
> +
> + ptr.package = p->e.name;
> +
> + if (!tb[RPC_ADD_TYPE])
> + goto out;
> +
> + /* add named section */
> + if (tb[RPC_ADD_NAME])
> + {
> + ptr.section = blobmsg_data(tb[RPC_ADD_NAME]);
> + ptr.value = blobmsg_data(tb[RPC_ADD_TYPE]);
> + ptr.option = NULL;
> +
> + if (rpc_uci_lookup(&ptr) || uci_set(cursor, &ptr))
> + goto out;
> + } else {
> + if (uci_add_section(cursor, p, blobmsg_data(tb[RPC_ADD_TYPE]),
> &s) || !s)
> + goto out;
> +
> + ptr.section = s->e.name;
> + }
> +
> + blobmsg_for_each_attr(cur, msg, rem)
> + {
> + if (!strcmp(blobmsg_name(cur), ".type") ||
> + !strcmp(blobmsg_name(cur), ".anonymous") ||
> + !strcmp(blobmsg_name(cur), ".name") ||
> + !strcmp(blobmsg_name(cur), ".index"))
> + continue;
> + ptr.o = NULL;
> + ptr.option = blobmsg_name(cur);
> +
> + if (rpc_uci_lookup(&ptr) || !ptr.s)
> + continue;
> +
> + switch (blobmsg_type(cur))
> + {
> + case BLOBMSG_TYPE_ARRAY:
> + blobmsg_for_each_attr(elem, cur, rem2)
> + if (rpc_uci_format_blob(elem,
> &ptr.value))
> + uci_add_list(cursor, &ptr);
> + break;
> +
> + default:
> + if (rpc_uci_format_blob(cur, &ptr.value))
> + uci_set(cursor, &ptr);
> + break;
> + }
> + }
> +
> + return 0;
> +out:
> + return 1;
> +}
> +
> +/* blobmsg example: { "wan": { ".type": "interface", ".name":"wan",
> ".anonymous": false }, .. } */
> +static int
> +rpc_uci_import(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_I_MAX];
> + struct blob_attr *cur;
> + struct uci_package *p = NULL;
> + struct uci_element *e, *tmp;
> + struct uci_ptr ptr = { 0 };
> + int rem;
> +
> +
> + blobmsg_parse(rpc_uci_import_policy, __RPC_I_MAX, tb,
> + blob_data(msg), blob_len(msg));
> +
> + if (!tb[RPC_I_CONFIG] || !tb[RPC_I_VALUES])
> + return UBUS_STATUS_INVALID_ARGUMENT;
> +
> + if (!rpc_uci_write_access(tb[RPC_I_SESSION], tb[RPC_I_CONFIG]))
> + return UBUS_STATUS_PERMISSION_DENIED;
> +
> + ptr.package = blobmsg_data(tb[RPC_I_CONFIG]);
> +
> + if (uci_load(cursor, ptr.package, &p))
> + return rpc_uci_status();
> +
> + /* delete all section within package */
> + uci_foreach_element_safe(&p->sections, tmp, e)
> + {
> + ptr.s = NULL;
> + ptr.section = e->name;
> + rpc_uci_merge_delete(NULL, &ptr);
> + }
> +
> + /* add new sections */
> + blobmsg_for_each_attr(cur, tb[RPC_I_VALUES], rem)
> + {
> + if (rpc_uci_add_section(p, cur))
> + goto out;
> + }
> +
> + uci_save(cursor, p);
> +
> +out:
> + uci_unload(cursor, p);
> +
> + return rpc_uci_status();
> +}
> +
> +static int
> rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
> struct ubus_request_data *req, const char *method,
> struct blob_attr *msg)
> @@ -1538,6 +1689,7 @@ int rpc_uci_api_init(struct ubus_context *ctx)
> UBUS_METHOD("apply", rpc_uci_apply, rpc_uci_apply_policy),
> UBUS_METHOD("confirm", rpc_uci_confirm,
> rpc_uci_rollback_policy),
> UBUS_METHOD("rollback", rpc_uci_rollback,
> rpc_uci_rollback_policy),
> + UBUS_METHOD("import", rpc_uci_import,
> rpc_uci_import_policy),
> };
>
> static struct ubus_object_type uci_type =
>
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
