projects
/
project
/
uhttpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fb73b3
)
ubus: pass current session id as ubus_rpc_session attribute to any called procedure
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 8 Aug 2013 11:40:40 +0000
(13:40 +0200)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 8 Aug 2013 11:40:40 +0000
(13:40 +0200)
ubus.c
patch
|
blob
|
history
diff --git
a/ubus.c
b/ubus.c
index 8129c20e4b5bd892a0123e4f59954e30e475aaa7..3c1124662eccc503d969c99a5ecac737bb1a7e95 100644
(file)
--- a/
ubus.c
+++ b/
ubus.c
@@
-241,7
+241,7
@@
static void uh_ubus_single_error(struct client *cl, enum rpc_error type)
ops->request_done(cl);
}
ops->request_done(cl);
}
-static void uh_ubus_send_request(struct client *cl, json_object *obj, struct blob_attr *args)
+static void uh_ubus_send_request(struct client *cl, json_object *obj,
const char *sid,
struct blob_attr *args)
{
struct dispatch *d = &cl->dispatch;
struct dispatch_ubus *du = &d->ubus;
{
struct dispatch *d = &cl->dispatch;
struct dispatch_ubus *du = &d->ubus;
@@
-253,6
+253,8
@@
static void uh_ubus_send_request(struct client *cl, json_object *obj, struct blo
blobmsg_for_each_attr(cur, args, rem)
blobmsg_add_blob(&req, cur);
blobmsg_for_each_attr(cur, args, rem)
blobmsg_add_blob(&req, cur);
+ blobmsg_add_string(&req, "ubus_rpc_session", sid);
+
blob_buf_init(&du->buf, 0);
memset(&du->req, 0, sizeof(du->req));
ret = ubus_invoke_async(ctx, du->obj, du->func, req.head, &du->req);
blob_buf_init(&du->buf, 0);
memset(&du->req, 0, sizeof(du->req));
ret = ubus_invoke_async(ctx, du->obj, du->func, req.head, &du->req);
@@
-484,7
+486,7
@@
static void uh_ubus_handle_request_object(struct client *cl, struct json_object
goto error;
}
goto error;
}
- uh_ubus_send_request(cl, obj, data.data);
+ uh_ubus_send_request(cl, obj, data.
sid, data.
data);
goto out;
}
else if (!strcmp(data.method, "list")) {
goto out;
}
else if (!strcmp(data.method, "list")) {