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

session: restore ACL dumping for session get and session list calls

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-09-12 12:13:05 +02:00
parent 4c9f178ad6
commit b76addec87
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
session.c
View file

@ -203,7 +203,7 @@ rpc_session_dump_acls(struct rpc_session *ses, struct blob_buf *b)
} }
static void static void
rpc_session_to_blob(struct rpc_session *ses) rpc_session_to_blob(struct rpc_session *ses, bool acls)
{ {
void *c; void *c;
@ -213,6 +213,12 @@ rpc_session_to_blob(struct rpc_session *ses)
blobmsg_add_u32(&buf, "timeout", ses->timeout); blobmsg_add_u32(&buf, "timeout", ses->timeout);
blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000); blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000);
if (acls) {
c = blobmsg_open_table(&buf, "acls");
rpc_session_dump_acls(ses, &buf);
blobmsg_close_table(&buf, c);
}
c = blobmsg_open_table(&buf, "data"); c = blobmsg_open_table(&buf, "data");
rpc_session_dump_data(ses, &buf); rpc_session_dump_data(ses, &buf);
blobmsg_close_table(&buf, c); blobmsg_close_table(&buf, c);
@ -222,7 +228,7 @@ static void
rpc_session_dump(struct rpc_session *ses, struct ubus_context *ctx, rpc_session_dump(struct rpc_session *ses, struct ubus_context *ctx,
struct ubus_request_data *req) struct ubus_request_data *req)
{ {
rpc_session_to_blob(ses); rpc_session_to_blob(ses, true);
ubus_send_reply(ctx, req, buf.head); ubus_send_reply(ctx, req, buf.head);
} }
@ -1296,7 +1302,7 @@ void rpc_session_freeze(void)
continue; continue;
snprintf(path, sizeof(path) - 1, RPC_SESSION_DIRECTORY "/%s", ses->id); snprintf(path, sizeof(path) - 1, RPC_SESSION_DIRECTORY "/%s", ses->id);
rpc_session_to_blob(ses); rpc_session_to_blob(ses, false);
rpc_blob_to_file(path, buf.head); rpc_blob_to_file(path, buf.head);
} }
} }