return;
s = container_of(obj, struct ubus_subscriber, obj);
- s->remove_cb(ctx, s, blob_get_u32(attrbuf[UBUS_ATTR_TARGET]));
+ if (s->remove_cb)
+ s->remove_cb(ctx, s, blob_get_u32(attrbuf[UBUS_ATTR_TARGET]));
}
static void
ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr,
struct ubus_object *obj, struct blob_attr **attrbuf)
{
- struct ubus_request_data req = {};
+ struct ubus_request_data req = {
+ .fd = -1,
+ };
int method;
int ret;
+ bool no_reply = false;
if (!obj) {
ret = UBUS_STATUS_NOT_FOUND;
goto send;
}
+ if (attrbuf[UBUS_ATTR_NO_REPLY])
+ no_reply = blob_get_int8(attrbuf[UBUS_ATTR_NO_REPLY]);
+
req.peer = hdr->peer;
req.seq = hdr->seq;
req.object = obj->id;
ret = obj->methods[method].handler(ctx, obj, &req,
blob_data(attrbuf[UBUS_ATTR_METHOD]),
attrbuf[UBUS_ATTR_DATA]);
- if (req.deferred)
+ if (req.deferred || no_reply)
return;
send:
struct ubus_object *obj;
uint32_t objid;
- attrbuf = ubus_parse_msg(hdr->data);
+ attrbuf = ubus_parse_msg(ubus_msghdr_data(hdr));
if (!attrbuf[UBUS_ATTR_OBJID])
return;
mtbl = blobmsg_open_table(&b, m->name);
- for (i = 0; i < m->n_policy; i++)
+ for (i = 0; i < m->n_policy; i++) {
+ if (m->mask && !(m->mask & (1 << i)))
+ continue;
+
blobmsg_add_u32(&b, m->policy[i].name, m->policy[i].type);
+ }
blobmsg_close_table(&b, mtbl);
}