projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pass ubus_msg_buf to callback of internal object
[project/ubus.git]
/
ubusd_proto.c
diff --git
a/ubusd_proto.c
b/ubusd_proto.c
index
991a70a
..
caede10
100644
(file)
--- a/
ubusd_proto.c
+++ b/
ubusd_proto.c
@@
-158,8
+158,7
@@
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
blob_buf_init(&b, 0);
blob_buf_init(&b, 0);
- if (obj->path.key)
- blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
+ blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
@@
-245,7
+244,7
@@
static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
method = blob_data(attr[UBUS_ATTR_METHOD]);
if (!obj->client)
method = blob_data(attr[UBUS_ATTR_METHOD]);
if (!obj->client)
- return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+ return obj->recv_msg(cl,
ub,
method, attr[UBUS_ATTR_DATA]);
ub->hdr.peer = cl->id.id;
blob_buf_init(&b, 0);
ub->hdr.peer = cl->id.id;
blob_buf_init(&b, 0);