DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

luci2: convert to plugin library

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-09-02 14:52:49 +02:00
parent c849d04fc8
commit 7434b2bf6c
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
luci2.c
View file

@ -32,8 +32,9 @@
#include <glob.h> #include <glob.h>
#include "luci2.h" #include "luci2.h"
#include "exec.h" #include "plugin.h"
#include "session.h"
static const struct rpc_daemon_ops *ops;
static struct blob_buf buf; static struct blob_buf buf;
static struct uci_context *cursor; static struct uci_context *cursor;
@ -964,7 +965,7 @@ rpc_luci2_upgrade_test(struct ubus_context *ctx, struct ubus_object *obj,
struct blob_attr *msg) struct blob_attr *msg)
{ {
const char *cmd[4] = { "sysupgrade", "--test", "/tmp/firmware.bin", NULL }; const char *cmd[4] = { "sysupgrade", "--test", "/tmp/firmware.bin", NULL };
return rpc_exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req); return ops->exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req);
} }
static int static int
@ -994,7 +995,7 @@ rpc_luci2_backup_restore(struct ubus_context *ctx, struct ubus_object *obj,
const char *cmd[4] = { "sysupgrade", "--restore-backup", const char *cmd[4] = { "sysupgrade", "--restore-backup",
"/tmp/backup.tar.gz", NULL }; "/tmp/backup.tar.gz", NULL };
return rpc_exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req); return ops->exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req);
} }
static int static int
@ -1110,8 +1111,8 @@ rpc_luci2_backup_list(struct ubus_context *ctx, struct ubus_object *obj,
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
return rpc_exec(cmd, NULL, backup_parse_list, NULL, backup_finish_list, return ops->exec(cmd, NULL, backup_parse_list, NULL, backup_finish_list,
state, ctx, req); state, ctx, req);
} }
static int static int
@ -1848,8 +1849,8 @@ opkg_exec_list(const char *action, struct blob_attr *msg,
if (state->req_count <= 0 || state->req_count > 100) if (state->req_count <= 0 || state->req_count > 100)
state->req_count = 100; state->req_count = 100;
return rpc_exec(cmd, NULL, opkg_parse_list, NULL, opkg_finish_list, return ops->exec(cmd, NULL, opkg_parse_list, NULL, opkg_finish_list,
state, ctx, req); state, ctx, req);
} }
@ -1883,7 +1884,7 @@ rpc_luci2_opkg_update(struct ubus_context *ctx, struct ubus_object *obj,
struct blob_attr *msg) struct blob_attr *msg)
{ {
const char *cmd[3] = { "opkg", "update", NULL }; const char *cmd[3] = { "opkg", "update", NULL };
return rpc_exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req); return ops->exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req);
} }
static int static int
@ -1903,7 +1904,7 @@ rpc_luci2_opkg_install(struct ubus_context *ctx, struct ubus_object *obj,
cmd[3] = blobmsg_data(tb[RPC_OP_PACKAGE]); cmd[3] = blobmsg_data(tb[RPC_OP_PACKAGE]);
return rpc_exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req); return ops->exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req);
} }
static int static int
@ -1923,7 +1924,7 @@ rpc_luci2_opkg_remove(struct ubus_context *ctx, struct ubus_object *obj,
cmd[3] = blobmsg_data(tb[RPC_OP_PACKAGE]); cmd[3] = blobmsg_data(tb[RPC_OP_PACKAGE]);
return rpc_exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req); return ops->exec(cmd, NULL, NULL, NULL, NULL, NULL, ctx, req);
} }
static int static int
@ -1987,16 +1988,16 @@ menu_access(struct blob_attr *sid, struct blob_attr *acls, struct blob_buf *e)
blobmsg_for_each_attr(acl, acls, rem) blobmsg_for_each_attr(acl, acls, rem)
{ {
if (!rpc_session_access(blobmsg_data(sid), "luci-ui", if (!ops->access(blobmsg_data(sid), "luci-ui",
blobmsg_data(acl), "read")) blobmsg_data(acl), "read"))
{ {
rv = false; rv = false;
break; break;
} }
blobmsg_add_u8(e, blobmsg_data(acl), blobmsg_add_u8(e, blobmsg_data(acl),
rpc_session_access(blobmsg_data(sid), "luci-ui", ops->access(blobmsg_data(sid), "luci-ui",
blobmsg_data(acl), "write")); blobmsg_data(acl), "write"));
} }
blobmsg_close_table(e, c); blobmsg_close_table(e, c);
@ -2076,7 +2077,8 @@ skip:
} }
int rpc_luci2_api_init(struct ubus_context *ctx) static int
rpc_luci2_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
{ {
int rv = 0; int rv = 0;
@ -2197,6 +2199,8 @@ int rpc_luci2_api_init(struct ubus_context *ctx)
if (!cursor) if (!cursor)
return UBUS_STATUS_UNKNOWN_ERROR; return UBUS_STATUS_UNKNOWN_ERROR;
ops = o;
rv |= ubus_add_object(ctx, &system_obj); rv |= ubus_add_object(ctx, &system_obj);
rv |= ubus_add_object(ctx, &network_obj); rv |= ubus_add_object(ctx, &network_obj);
rv |= ubus_add_object(ctx, &opkg_obj); rv |= ubus_add_object(ctx, &opkg_obj);
@ -2204,3 +2208,7 @@ int rpc_luci2_api_init(struct ubus_context *ctx)
return rv; return rv;
} }
const struct rpc_plugin rpc_plugin = {
.init = rpc_luci2_api_init
};

2
luci2.h
View file

@ -30,6 +30,4 @@
/* location of menu definitions */ /* location of menu definitions */
#define RPC_LUCI2_MENU_FILES "/usr/share/luci2/menu.d/*.json" #define RPC_LUCI2_MENU_FILES "/usr/share/luci2/menu.d/*.json"
int rpc_luci2_api_init(struct ubus_context *ctx);
#endif #endif

2
main.c
View file

@ -25,7 +25,6 @@
#include "session.h" #include "session.h"
#include "uci.h" #include "uci.h"
#include "luci2.h"
#include "plugin.h" #include "plugin.h"
static struct ubus_context *ctx; static struct ubus_context *ctx;
@ -62,7 +61,6 @@ int main(int argc, char **argv)
rpc_session_api_init(ctx); rpc_session_api_init(ctx);
rpc_uci_api_init(ctx); rpc_uci_api_init(ctx);
rpc_luci2_api_init(ctx);
rpc_plugin_api_init(ctx); rpc_plugin_api_init(ctx);
uloop_run(); uloop_run();