uci: add state call to retrieve uci state variables

[project/rpcd.git] / uci.c

diff --git a/uci.c b/uci.c
index 62ca7fe..a49c8d0 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -520,9 +520,8 @@ rpc_uci_dump_package(struct uci_package *p, const char *name,
 
 
 static int
-rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
-            struct ubus_request_data *req, const char *method,
-            struct blob_attr *msg)
+rpc_uci_getcommon(struct ubus_context *ctx, struct ubus_request_data *req,
+                  struct blob_attr *msg, bool use_state)
 {
        struct blob_attr *tb[__RPC_G_MAX];
        struct uci_package *p = NULL;
@@ -538,10 +537,12 @@ rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
                return UBUS_STATUS_PERMISSION_DENIED;
 
        ptr.package = blobmsg_data(tb[RPC_G_CONFIG]);
-       uci_load(cursor, ptr.package, &p);
 
-       if (!p)
-               goto out;
+       if (use_state)
+               uci_set_savedir(cursor, "/var/state");
+
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        if (tb[RPC_G_SECTION])
        {
@@ -577,13 +578,28 @@ rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
        ubus_send_reply(ctx, req, buf.head);
 
 out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
 
 static int
+rpc_uci_get(struct ubus_context *ctx, struct ubus_object *obj,
+            struct ubus_request_data *req, const char *method,
+            struct blob_attr *msg)
+{
+       return rpc_uci_getcommon(ctx, req, msg, false);
+}
+
+static int
+rpc_uci_state(struct ubus_context *ctx, struct ubus_object *obj,
+              struct ubus_request_data *req, const char *method,
+              struct blob_attr *msg)
+{
+       return rpc_uci_getcommon(ctx, req, msg, true);
+}
+
+static int
 rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
             struct ubus_request_data *req, const char *method,
             struct blob_attr *msg)
@@ -606,10 +622,8 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
 
        ptr.package = blobmsg_data(tb[RPC_A_CONFIG]);
 
-       uci_load(cursor, ptr.package, &p);
-
-       if (!p)
-               goto out;
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        /* add named section */
        if (tb[RPC_A_NAME])
@@ -664,8 +678,7 @@ rpc_uci_add(struct ubus_context *ctx, struct ubus_object *obj,
        ubus_send_reply(ctx, req, buf.head);
 
 out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -687,6 +700,7 @@ rpc_uci_merge_set(struct blob_attr *opt, struct uci_ptr *ptr)
 
        ptr->o = NULL;
        ptr->option = blobmsg_name(opt);
+       ptr->value = NULL;
 
        if (rpc_uci_lookup(ptr) || !ptr->s)
                return;
@@ -737,10 +751,9 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
                return UBUS_STATUS_PERMISSION_DENIED;
 
        ptr.package = blobmsg_data(tb[RPC_S_CONFIG]);
-       uci_load(cursor, ptr.package, &p);
 
-       if (!p)
-               goto out;
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        if (tb[RPC_S_SECTION])
        {
@@ -765,10 +778,7 @@ rpc_uci_set(struct ubus_context *ctx, struct ubus_object *obj,
        }
 
        uci_save(cursor, p);
-
-out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -844,10 +854,9 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
                return UBUS_STATUS_PERMISSION_DENIED;
 
        ptr.package = blobmsg_data(tb[RPC_D_CONFIG]);
-       uci_load(cursor, ptr.package, &p);
 
-       if (!p)
-               goto out;
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        if (tb[RPC_D_SECTION])
        {
@@ -877,10 +886,7 @@ rpc_uci_delete(struct ubus_context *ctx, struct ubus_object *obj,
        }
 
        uci_save(cursor, p);
-
-out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -910,10 +916,8 @@ rpc_uci_rename(struct ubus_context *ctx, struct ubus_object *obj,
        if (tb[RPC_R_OPTION])
                ptr.option = blobmsg_data(tb[RPC_R_OPTION]);
 
-       uci_load(cursor, ptr.package, &p);
-
-       if (!p)
-               goto out;
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        if (uci_lookup_ptr(cursor, &ptr, NULL, true))
                goto out;
@@ -930,8 +934,7 @@ rpc_uci_rename(struct ubus_context *ctx, struct ubus_object *obj,
        uci_save(cursor, p);
 
 out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -958,10 +961,8 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
 
        ptr.package = blobmsg_data(tb[RPC_O_CONFIG]);
 
-       uci_load(cursor, ptr.package, &p);
-
-       if (!p)
-               goto out;
+       if (uci_load(cursor, ptr.package, &p))
+               return rpc_uci_status();
 
        blobmsg_for_each_attr(cur, tb[RPC_O_SECTIONS], rem)
        {
@@ -978,10 +979,7 @@ rpc_uci_order(struct ubus_context *ctx, struct ubus_object *obj,
        }
 
        uci_save(cursor, p);
-
-out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -1041,10 +1039,8 @@ rpc_uci_changes(struct ubus_context *ctx, struct ubus_object *obj,
        if (!rpc_uci_read_access(tb[RPC_C_SESSION], tb[RPC_C_CONFIG]))
                return UBUS_STATUS_PERMISSION_DENIED;
 
-       uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p);
-
-       if (!p)
-               goto out;
+       if (uci_load(cursor, blobmsg_data(tb[RPC_C_CONFIG]), &p))
+               return rpc_uci_status();
 
        blob_buf_init(&buf, 0);
        c = blobmsg_open_array(&buf, "changes");
@@ -1056,9 +1052,7 @@ rpc_uci_changes(struct ubus_context *ctx, struct ubus_object *obj,
 
        ubus_send_reply(ctx, req, buf.head);
 
-out:
-       if (p)
-               uci_unload(cursor, p);
+       uci_unload(cursor, p);
 
        return rpc_uci_status();
 }
@@ -1106,9 +1100,7 @@ rpc_uci_revert_commit(struct ubus_context *ctx, struct blob_attr *msg, bool comm
 
        if (commit)
        {
-               uci_load(cursor, ptr.package, &p);
-
-               if (p)
+               if (!uci_load(cursor, ptr.package, &p))
                {
                        uci_commit(cursor, &p, false);
                        uci_unload(cursor, p);
@@ -1207,9 +1199,8 @@ rpc_uci_apply_config(struct ubus_context *ctx, char *config)
        struct uci_ptr ptr = { 0 };
 
        ptr.package = config;
-       uci_load(cursor, ptr.package, &p);
 
-       if (p) {
+       if (!uci_load(cursor, ptr.package, &p)) {
                uci_commit(cursor, &p, false);
                uci_unload(cursor, p);
        }
@@ -1471,6 +1462,7 @@ 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("state",    rpc_uci_state,    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),