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

ubusd: fix id lookup of objects with path and no methods

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-11-20 17:05:00 +01:00
parent d009a08473
commit 5ca6bae3a2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ubusd_proto.c
View file

@ -156,7 +156,7 @@ static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj) static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
{ {
struct ubus_method *m; struct ubus_method *m;
int cnt = 0; int all_cnt = 0, cnt = 0;
void *s; void *s;
if (!obj->type) if (!obj->type)
@ -170,6 +170,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE); s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
list_for_each_entry(m, &obj->type->methods, list) { list_for_each_entry(m, &obj->type->methods, list) {
all_cnt++;
if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) { if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
blobmsg_add_blob(&b, m->data); blobmsg_add_blob(&b, m->data);
cnt++; cnt++;
@ -177,7 +178,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
} }
blob_nest_end(&b, s); blob_nest_end(&b, s);
if (cnt) if (cnt || !all_cnt)
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA); ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
} }