Re: [OpenWrt-Devel] [PATCH] uci: add import call
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,
> ))
> uci_add_list(cursor, );
> + }
> 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() || uci_set(cursor, ))
> + goto out;
> + } else {
> + if (uci_add_section(cursor, p, blobmsg_data(tb[RPC_ADD_TYPE]),
> ) || !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.s)
> + continue;
> +
> + switch (blobmsg_type(cur))
> + {
> + case BLOBMSG_TYPE_ARRAY:
> + blobmsg_for_each_attr(elem, cur, rem2)
> + if (rpc_uci_format_blob(elem,
> ))
> + uci_add_list(cursor, );
> + break;
> +
> + default:
> + if (rpc_uci_format_blob(cur, ))
> + uci_set(cursor, );
> + 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, ))
> + return rpc_uci_status();
> +
> + /* delete all section within package */
> + uci_foreach_element_safe(>sections, tmp, e)
> + {
> + ptr.s = NULL;
> + ptr.section = e->name;
> + rpc_uci_merge_delete(NULL, );
> + }
> +
> + /* add new sections */
> + blobmsg_for_each_attr(cur, tb[RPC_I_VALUES], rem)
> + {
> + if
[OpenWrt-Devel] [PATCH] uci: add import call
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
@@ -32,6 +32,21 @@ static struct ubus_context *apply_ctx;
static char apply_sid[RPC_SID_LEN + 1];
enum {
+ RPC_ADD_TYPE,
+ RPC_ADD_NAME,
+ RPC_ADD_ANONYMOUS,
+ RPC_ADD_INDEX,
+ __RPC_ADD_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_add_section_policy[__RPC_ADD_MAX] =
{
+ [RPC_ADD_TYPE] = { .name = ".type", .type =
BLOBMSG_TYPE_STRING },
+ [RPC_ADD_NAME] = { .name = ".name", .type =
BLOBMSG_TYPE_STRING },
+ [RPC_ADD_ANONYMOUS] = { .name = ".anonymous", .type =
BLOBMSG_TYPE_BOOL },
+ [RPC_ADD_INDEX] = { .name = ".index", .type =
BLOBMSG_TYPE_INT32 },
+};
+
+enum {
RPC_G_CONFIG,
RPC_G_SECTION,
RPC_G_OPTION,
@@ -90,6 +105,20 @@ static const struct blobmsg_policy
rpc_uci_set_policy[__RPC_S_MAX] = {
};
enum {
+ RPC_I_CONFIG,
+ RPC_I_VALUES,
+ RPC_I_SESSION,
+ __RPC_I_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_import_policy[__RPC_I_MAX] = {
+ [RPC_I_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_STRING },
+ [RPC_I_VALUES] = { .name = "values", .type = BLOBMSG_TYPE_TABLE },
+ [RPC_I_SESSION] = { .name = "ubus_rpc_session",
+ .type = BLOBMSG_TYPE_STRING },
+};
+
+enum {
RPC_D_CONFIG,
RPC_D_SECTION,
RPC_D_TYPE,
@@ -179,6 +208,9 @@ static const struct blobmsg_policy
rpc_uci_rollback_policy[__RPC_B_MAX] = {
.type = BLOBMSG_TYPE_STRING },
};
+static void
+rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr);
+
/*
* Turn uci error state into ubus return code
*/
@@ -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,
))
uci_add_list(cursor, );
+ }
break;
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() || uci_set(cursor, ))
+ goto out;
+ } else {
+ if (uci_add_section(cursor, p, blobmsg_data(tb[RPC_ADD_TYPE]),
) || !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.s)
+ continue;
+
+ switch (blobmsg_type(cur))
+ {
+ case BLOBMSG_TYPE_ARRAY:
+ blobmsg_for_each_attr(elem, cur, rem2)
+ if (rpc_uci_format_blob(elem,
))
+ uci_add_list(cursor, );
+ break;
+
+ default:
+ if (rpc_uci_format_blob(cur, ))
+ uci_set(cursor, );
+ break;
+ }
+ }
+
+
Re: [OpenWrt-Devel] [PATCH] uci: add import call
On 26 August 2015 at 18:13, Alexander Couzens lyn...@fe80.eu 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 } } }'
There is a spaces vs. tabs mess. Please stick to the coding style
already used in the project.
You didn't use tabs in most of the code and rpc_uci_import looks like
a random mix of both.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] uci: add import call
Sorry I forgot an rpcd prefix in the subject. This is a patch for rpcd. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] uci: add import call
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(+)
diff --git a/uci.c b/uci.c
index 8b5dafd..86c3b6e 100644
--- a/uci.c
+++ b/uci.c
@@ -32,6 +32,21 @@ static struct ubus_context *apply_ctx;
static char apply_sid[RPC_SID_LEN + 1];
enum {
+ RPC_ADD_TYPE,
+ RPC_ADD_NAME,
+ RPC_ADD_ANONYMOUS,
+ RPC_ADD_INDEX,
+ __RPC_ADD_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_add_section_policy[__RPC_ADD_MAX] =
{
+ [RPC_ADD_TYPE] = { .name = .type, .type = BLOBMSG_TYPE_STRING },
+ [RPC_ADD_NAME] = { .name = .name, .type = BLOBMSG_TYPE_STRING },
+ [RPC_ADD_ANONYMOUS] = { .name = .anonymous, .type = BLOBMSG_TYPE_BOOL },
+ [RPC_ADD_INDEX] = { .name = .index, .type = BLOBMSG_TYPE_INT32 },
+};
+
+enum {
RPC_G_CONFIG,
RPC_G_SECTION,
RPC_G_OPTION,
@@ -90,6 +105,20 @@ static const struct blobmsg_policy
rpc_uci_set_policy[__RPC_S_MAX] = {
};
enum {
+ RPC_I_CONFIG,
+ RPC_I_VALUES,
+ RPC_I_SESSION,
+ __RPC_I_MAX,
+};
+
+static const struct blobmsg_policy rpc_uci_import_policy[__RPC_I_MAX] = {
+ [RPC_I_CONFIG] = { .name = config, .type = BLOBMSG_TYPE_STRING },
+ [RPC_I_VALUES] = { .name = values, .type = BLOBMSG_TYPE_TABLE },
+ [RPC_I_SESSION] = { .name = ubus_rpc_session,
+ .type = BLOBMSG_TYPE_STRING },
+};
+
+enum {
RPC_D_CONFIG,
RPC_D_SECTION,
RPC_D_TYPE,
@@ -179,6 +208,9 @@ static const struct blobmsg_policy
rpc_uci_rollback_policy[__RPC_B_MAX] = {
.type = BLOBMSG_TYPE_STRING },
};
+static void
+rpc_uci_merge_delete(struct blob_attr *opt, struct uci_ptr *ptr);
+
/*
* Turn uci error state into ubus return code
*/
@@ -729,6 +761,125 @@ 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
