ubusd_acl: event send access list support

[project/ubus.git] / libubus-req.c

diff --git a/libubus-req.c b/libubus-req.c
index 0c7d589241af93a303919a64bffb70674522e611..74446f3fef51de83024d3d867d9c1b23f6d90a67 100644 (file)
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -32,6 +32,9 @@ static void req_data_cb(struct ubus_request *req, int type, struct blob_attr *da
                return;
 
        attr = ubus_parse_msg(data);
+       if (!attr[UBUS_ATTR_DATA])
+               return;
+
        req->data_cb(req, type, attr[UBUS_ATTR_DATA]);
 }
 
@@ -193,6 +196,14 @@ void ubus_complete_deferred_request(struct ubus_context *ctx, struct ubus_reques
        ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_STATUS, req->peer, req->fd);
 }
 
+static void ubus_put_data(struct blob_buf *buf, struct blob_attr *msg)
+{
+       if (msg)
+               blob_put(buf, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+       else
+               blob_put(buf, UBUS_ATTR_DATA, NULL, 0);
+}
+
 int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
                    struct blob_attr *msg)
 {
@@ -200,7 +211,7 @@ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
 
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, req->object);
-       blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+       ubus_put_data(&b, msg);
        ret = ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_DATA, req->peer, -1);
        if (ret < 0)
                return UBUS_STATUS_NO_DATA;
@@ -215,8 +226,7 @@ int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj,
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
        blob_put_string(&b, UBUS_ATTR_METHOD, method);
-       if (msg)
-               blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+       ubus_put_data(&b, msg);
 
        memset(req, 0, sizeof(*req));
        req->fd = fd;
@@ -253,6 +263,18 @@ ubus_notify_complete_cb(struct ubus_request *req, int ret)
        nreq->complete_cb(nreq, 0, 0);
 }
 
+static void
+ubus_notify_data_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       struct ubus_notify_request *nreq;
+
+       nreq = container_of(req, struct ubus_notify_request, req);
+       if (!nreq->data_cb)
+               return;
+
+       nreq->data_cb(nreq, type, msg);
+}
+
 static int
 __ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
                    const char *type, struct blob_attr *msg,
@@ -263,13 +285,11 @@ __ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id);
        blob_put_string(&b, UBUS_ATTR_METHOD, type);
+       ubus_put_data(&b, msg);
 
        if (!reply)
                blob_put_int8(&b, UBUS_ATTR_NO_REPLY, true);
 
-       if (msg)
-               blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
-
        if (ubus_start_request(ctx, &req->req, b.head, UBUS_MSG_NOTIFY, obj->id) < 0)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -278,6 +298,7 @@ __ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
        req->pending = 1;
        req->id[0] = obj->id;
        req->req.complete_cb = ubus_notify_complete_cb;
+       req->req.data_cb = ubus_notify_data_cb;
 
        return 0;
 }