add an inline function to add the ubus socket to uloop

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index 1342ba1..12bdb37 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -55,7 +55,7 @@ static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
                return *id1 > *id2;
 }
 
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
        blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
        return attrbuf;
@@ -102,8 +102,8 @@ static int ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
        return writev(ctx->sock.fd, iov, 2);
 }
 
-int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
-                      struct blob_attr *msg, int cmd, uint32_t peer)
+static int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
+                             struct blob_attr *msg, int cmd, uint32_t peer)
 {
        memset(req, 0, sizeof(*req));
 
@@ -423,6 +423,74 @@ skip:
        }
 }
 
+struct ubus_lookup_request {
+       struct ubus_request req;
+       ubus_lookup_handler_t cb;
+};
+
+static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg)
+{
+       struct ubus_lookup_request *req;
+       struct ubus_object_data obj;
+       struct blob_attr **attr;
+
+       req = container_of(ureq, struct ubus_lookup_request, req);
+       attr = ubus_parse_msg(msg);
+
+       if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH] ||
+           !attr[UBUS_ATTR_OBJTYPE])
+               return;
+
+       memset(&obj, 0, sizeof(obj));
+       obj.id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+       obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
+       obj.type_id = blob_get_int32(attr[UBUS_ATTR_OBJTYPE]);
+       obj.signature = attr[UBUS_ATTR_SIGNATURE];
+       req->cb(ureq->ctx, &obj, ureq->priv);
+}
+
+int ubus_lookup(struct ubus_context *ctx, const char *path,
+               ubus_lookup_handler_t cb, void *priv)
+{
+       struct ubus_lookup_request lookup;
+
+       blob_buf_init(&b, 0);
+       if (path)
+               blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+       ubus_start_request(ctx, &lookup.req, b.head, UBUS_MSG_LOOKUP, 0);
+       lookup.req.raw_data_cb = ubus_lookup_cb;
+       lookup.req.priv = priv;
+       lookup.cb = cb;
+       return ubus_complete_request(ctx, &lookup.req);
+}
+
+static void ubus_lookup_id_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       struct blob_attr **attr;
+       uint32_t *id = req->priv;
+
+       attr = ubus_parse_msg(msg);
+
+       if (!attr[UBUS_ATTR_OBJID])
+               return;
+
+       *id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+}
+
+int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id)
+{
+       struct ubus_request req;
+
+       blob_buf_init(&b, 0);
+       if (path)
+               blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+       ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0);
+       req.raw_data_cb = ubus_lookup_id_cb;
+       req.priv = id;
+
+       return ubus_complete_request(ctx, &req);
+}
+
 int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
                    struct blob_attr *msg)
 {
@@ -444,7 +512,8 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
        blob_put_string(&b, UBUS_ATTR_METHOD, method);
-       blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+       if (msg)
+               blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
 
        ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj);
 }
@@ -588,36 +657,27 @@ struct ubus_context *ubus_connect(const char *path)
                goto error;
 
        ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
-       if (ctx->sock.fd < 0) {
-               DPRINTF("Failed to connect to server\n");
+       if (ctx->sock.fd < 0)
                goto error_free;
-       }
+
        ctx->sock.cb = ubus_handle_data;
 
-       if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr)) {
-               DPRINTF("Failed to read initial message data\n");
+       if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr))
                goto error_close;
-       }
 
-       if (!ubus_validate_hdr(&hdr.hdr)) {
-               DPRINTF("Failed to validate initial message header\n");
+       if (!ubus_validate_hdr(&hdr.hdr))
                goto error_close;
-       }
 
-       if (hdr.hdr.type != UBUS_MSG_HELLO) {
-               DPRINTF("Unexpected initial message\n");
+       if (hdr.hdr.type != UBUS_MSG_HELLO)
                goto error_close;
-       }
 
        buf = calloc(1, blob_raw_len(&hdr.data));
        if (!buf)
                goto error_close;
 
        memcpy(buf, &hdr.data, sizeof(hdr.data));
-       if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf)) {
-               DPRINTF("Failed to retrieve initial message data\n");
+       if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf))
                goto error_free_buf;
-       }
 
        ctx->local_id = hdr.hdr.peer;
        free(buf);
@@ -627,10 +687,8 @@ struct ubus_context *ubus_connect(const char *path)
        INIT_LIST_HEAD(&ctx->requests);
        avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
 
-       if (!ctx->local_id) {
-               DPRINTF("Failed to get local peer id\n");
+       if (!ctx->local_id)
                goto error_close;
-       }
 
        return ctx;