X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=03899d6db44e766513053e0eb65a5acee27cc6ee;hp=590a0fa2ec5dbdf6e008545c0b19bc4f421e640d;hb=d366a6de839087d8a17e5855c14ae55e95b13c65;hpb=c6f705451527e6e5e8f5a2715f11478eeb8799e4 diff --git a/libubus.c b/libubus.c index 590a0fa..03899d6 100644 --- a/libubus.c +++ b/libubus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Felix Fietkau + * Copyright (C) 2011-2012 Felix Fietkau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 2.1 @@ -12,21 +12,16 @@ */ #include -#include #include -#include #include -#include #include #include -#include #include "libubus.h" +#include "libubus-internal.h" #include "ubusmsg.h" -#define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) } - const char *__ubus_strerror[__UBUS_STATUS_LAST] = { [UBUS_STATUS_OK] = "Success", [UBUS_STATUS_INVALID_COMMAND] = "Invalid command", @@ -38,17 +33,10 @@ const char *__ubus_strerror[__UBUS_STATUS_LAST] = { [UBUS_STATUS_TIMEOUT] = "Request timed out", [UBUS_STATUS_NOT_SUPPORTED] = "Operation not supported", [UBUS_STATUS_UNKNOWN_ERROR] = "Unknown error", + [UBUS_STATUS_CONNECTION_FAILED] = "Connection failed", }; -static struct blob_buf b; - -static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = { - [UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 }, - [UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 }, - [UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING }, - [UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING }, -}; -static struct blob_attr *attrbuf[UBUS_ATTR_MAX]; +struct blob_buf b __hidden = {}; struct ubus_pending_data { struct list_head list; @@ -73,12 +61,6 @@ static int ubus_cmp_id(const void *k1, const void *k2, void *ptr) return *id1 > *id2; } -static struct blob_attr **ubus_parse_msg(struct blob_attr *msg) -{ - blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX); - return attrbuf; -} - const char *ubus_strerror(int error) { static char err[32]; @@ -96,147 +78,9 @@ out: return err; } -static void wait_data(int fd, bool write) -{ - struct pollfd pfd = { .fd = fd }; - - pfd.events = write ? POLLOUT : POLLIN; - poll(&pfd, 1, 0); -} - -static int writev_retry(int fd, struct iovec *iov, int iov_len) -{ - int len = 0; - - do { - int cur_len = writev(fd, iov, iov_len); - if (cur_len < 0) { - switch(errno) { - case EAGAIN: - wait_data(fd, true); - break; - case EINTR: - break; - default: - return -1; - } - continue; - } - len += cur_len; - while (cur_len >= iov->iov_len) { - cur_len -= iov->iov_len; - iov_len--; - iov++; - if (!cur_len || !iov_len) - return len; - } - iov->iov_len -= cur_len; - } while (1); -} - -static int ubus_send_msg(struct ubus_context *ctx, uint32_t seq, - struct blob_attr *msg, int cmd, uint32_t peer) -{ - struct ubus_msghdr hdr; - struct iovec iov[2] = { - STATIC_IOV(hdr) - }; - - hdr.version = 0; - hdr.type = cmd; - hdr.seq = seq; - hdr.peer = peer; - - if (!msg) { - blob_buf_init(&b, 0); - msg = b.head; - } - - iov[1].iov_base = (char *) msg; - iov[1].iov_len = blob_raw_len(msg); - - return writev_retry(ctx->sock.fd, iov, ARRAY_SIZE(iov)); -} - -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)); - - if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN) - return -1; - - INIT_LIST_HEAD(&req->list); - INIT_LIST_HEAD(&req->pending); - req->ctx = ctx; - req->peer = peer; - req->seq = ++ctx->request_seq; - return ubus_send_msg(ctx, req->seq, msg, cmd, peer); -} - -static bool recv_retry(int fd, struct iovec *iov, bool wait) -{ - int bytes; - - while (iov->iov_len > 0) { - if (wait) - wait_data(fd, false); - - bytes = read(fd, iov->iov_base, iov->iov_len); - if (bytes < 0) { - bytes = 0; - if (uloop_cancelled) - return false; - if (errno == EINTR) - continue; - - if (errno != EAGAIN) - return false; - } - if (!wait && !bytes) - return false; - - wait = true; - iov->iov_len -= bytes; - iov->iov_base += bytes; - } - - return true; -} - -static bool ubus_validate_hdr(struct ubus_msghdr *hdr) -{ - if (hdr->version != 0) - return false; - - if (blob_raw_len(hdr->data) < sizeof(*hdr->data)) - return false; - - if (blob_pad_len(hdr->data) > UBUS_MAX_MSGLEN) - return false; - - return true; -} - -static bool get_next_msg(struct ubus_context *ctx) -{ - struct iovec iov = STATIC_IOV(ctx->msgbuf.hdr); - - /* receive header + start attribute */ - iov.iov_len += sizeof(struct blob_attr); - if (!recv_retry(ctx->sock.fd, &iov, false)) - return false; - - iov.iov_len = blob_len(ctx->msgbuf.hdr.data); - if (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true)) - return false; - - return ubus_validate_hdr(&ctx->msgbuf.hdr); -} - static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret) { - ubus_parse_msg(hdr->data); + struct blob_attr **attrbuf = ubus_parse_msg(hdr->data); if (!attrbuf[UBUS_ATTR_STATUS]) return false; @@ -341,58 +185,15 @@ static struct ubus_request *ubus_find_request(struct ubus_context *ctx, uint32_t return NULL; } -static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hdr) +void ubus_complete_deferred_request(struct ubus_context *ctx, struct ubus_request_data *req, int ret) { - struct ubus_request_data req; - struct ubus_object *obj; - uint32_t objid = 0; - int method; - int ret = 0; - - req.peer = hdr->peer; - req.seq = hdr->seq; - ubus_parse_msg(hdr->data); - - if (!attrbuf[UBUS_ATTR_OBJID]) - return; - - objid = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]); - - if (!attrbuf[UBUS_ATTR_METHOD]) { - ret = UBUS_STATUS_INVALID_ARGUMENT; - goto send; - } - - obj = avl_find_element(&ctx->objects, &objid, obj, avl); - if (!obj) { - ret = UBUS_STATUS_NOT_FOUND; - goto send; - } - - for (method = 0; method < obj->n_methods; method++) - if (!obj->methods[method].name || - !strcmp(obj->methods[method].name, - blob_data(attrbuf[UBUS_ATTR_METHOD]))) - goto found; - - /* not found */ - ret = UBUS_STATUS_METHOD_NOT_FOUND; - goto send; - -found: - req.object = objid; - ret = obj->methods[method].handler(ctx, obj, &req, - blob_data(attrbuf[UBUS_ATTR_METHOD]), - attrbuf[UBUS_ATTR_DATA]); - -send: blob_buf_init(&b, 0); blob_put_int32(&b, UBUS_ATTR_STATUS, ret); - blob_put_int32(&b, UBUS_ATTR_OBJID, objid); - ubus_send_msg(ctx, req.seq, b.head, UBUS_MSG_STATUS, req.peer); + blob_put_int32(&b, UBUS_ATTR_OBJID, req->object); + ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_STATUS, req->peer); } -static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr) +void __hidden ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr) { struct ubus_pending_invoke *pending; struct ubus_request *req; @@ -427,6 +228,10 @@ static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr) ubus_process_invoke(ctx, hdr); } break; + + case UBUS_MSG_UNSUBSCRIBE: + ubus_process_unsubscribe(ctx, hdr); + break; } } @@ -461,21 +266,6 @@ void ubus_complete_request_async(struct ubus_context *ctx, struct ubus_request * list_add(&req->list, &ctx->requests); } -static void ubus_handle_data(struct uloop_fd *u, unsigned int events) -{ - struct ubus_context *ctx = container_of(u, struct ubus_context, sock); - struct ubus_msghdr *hdr = &ctx->msgbuf.hdr; - - while (get_next_msg(ctx)) { - ubus_process_msg(ctx, hdr); - if (uloop_cancelled) - break; - } - - if (u->eof) - ctx->connection_lost(ctx); -} - static void ubus_sync_req_cb(struct ubus_request *req, int ret) { req->status_msg = true; @@ -573,6 +363,22 @@ static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr req->cb(ureq->ctx, &obj, ureq->priv); } +int __hidden 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)); + + if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN) + return -1; + + INIT_LIST_HEAD(&req->list); + INIT_LIST_HEAD(&req->pending); + req->ctx = ctx; + req->peer = peer; + req->seq = ++ctx->request_seq; + return ubus_send_msg(ctx, req->seq, msg, cmd, peer); +} + int ubus_lookup(struct ubus_context *ctx, const char *path, ubus_lookup_handler_t cb, void *priv) { @@ -663,122 +469,7 @@ int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method, return ubus_complete_request(ctx, &req, timeout); } -static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg) -{ - struct ubus_object *obj = req->priv; - - ubus_parse_msg(msg); - if (!attrbuf[UBUS_ATTR_OBJID]) - return; - - obj->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]); - - if (attrbuf[UBUS_ATTR_OBJTYPE]) - obj->type->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJTYPE]); - - obj->avl.key = &obj->id; - avl_insert(&req->ctx->objects, &obj->avl); -} - -static void ubus_push_method_data(const struct ubus_method *m) -{ - void *mtbl; - int i; - - mtbl = blobmsg_open_table(&b, m->name); - - for (i = 0; i < m->n_policy; i++) - blobmsg_add_u32(&b, m->policy[i].name, m->policy[i].type); - - blobmsg_close_table(&b, mtbl); -} - -static bool ubus_push_object_type(const struct ubus_object_type *type) -{ - void *s; - int i; - - s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE); - - for (i = 0; i < type->n_methods; i++) - ubus_push_method_data(&type->methods[i]); - - blob_nest_end(&b, s); - - return true; -} - -int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj) -{ - struct ubus_request req; - int ret; - - blob_buf_init(&b, 0); - - if (obj->name && obj->type) { - blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name); - - if (obj->type->id) - blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id); - else if (!ubus_push_object_type(obj->type)) - return UBUS_STATUS_INVALID_ARGUMENT; - } - - if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_ADD_OBJECT, 0) < 0) - return UBUS_STATUS_INVALID_ARGUMENT; - - req.raw_data_cb = ubus_add_object_cb; - req.priv = obj; - ret = ubus_complete_request(ctx, &req, 0); - if (ret) - return ret; - - if (!obj->id) - return UBUS_STATUS_NO_DATA; - - return 0; -} - -static void ubus_remove_object_cb(struct ubus_request *req, int type, struct blob_attr *msg) -{ - struct ubus_object *obj = req->priv; - - ubus_parse_msg(msg); - - if (!attrbuf[UBUS_ATTR_OBJID]) - return; - - obj->id = 0; - - if (attrbuf[UBUS_ATTR_OBJTYPE] && obj->type) - obj->type->id = 0; - - avl_delete(&req->ctx->objects, &obj->avl); -} - -int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj) -{ - struct ubus_request req; - int ret; - - blob_buf_init(&b, 0); - blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id); - - if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_REMOVE_OBJECT, 0) < 0) - return UBUS_STATUS_INVALID_ARGUMENT; - - req.raw_data_cb = ubus_remove_object_cb; - req.priv = obj; - ret = ubus_complete_request(ctx, &req, 0); - if (ret) - return ret; - - if (obj->id) - return UBUS_STATUS_NO_DATA; - - return 0; -} static int ubus_event_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, @@ -827,81 +518,6 @@ int ubus_register_event_handler(struct ubus_context *ctx, NULL, NULL, 0); } -enum { - WATCH_ID, - WATCH_NOTIFY, - __WATCH_MAX -}; - -static const struct blobmsg_policy watch_policy[] = { - [WATCH_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 }, - [WATCH_NOTIFY] = { .name = "notify", .type = BLOBMSG_TYPE_STRING }, -}; - - -static int ubus_watch_cb(struct ubus_context *ctx, struct ubus_object *obj, - struct ubus_request_data *req, - const char *method, struct blob_attr *msg) -{ - struct ubus_watch_object *w; - struct blob_attr *tb[__WATCH_MAX]; - - blobmsg_parse(watch_policy, ARRAY_SIZE(watch_policy), tb, blob_data(msg), blob_len(msg)); - - if (!tb[WATCH_ID] || !tb[WATCH_NOTIFY]) - return UBUS_STATUS_INVALID_ARGUMENT; - - if (req->peer) - return UBUS_STATUS_INVALID_ARGUMENT; - - w = container_of(obj, struct ubus_watch_object, obj); - w->cb(ctx, w, blobmsg_get_u32(tb[WATCH_ID])); - return 0; -} - -static const struct ubus_method watch_method = { - .name = NULL, - .handler = ubus_watch_cb, -}; - -int ubus_register_watch_object(struct ubus_context *ctx, struct ubus_watch_object *w_obj) -{ - struct ubus_object *obj = &w_obj->obj; - - obj->methods = &watch_method; - obj->n_methods = 1; - - return ubus_add_object(ctx, obj); -} - -static int -__ubus_watch_request(struct ubus_context *ctx, struct ubus_object *obj, uint32_t id, const char *method, int type) -{ - struct ubus_request req; - - blob_buf_init(&b, 0); - blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id); - blob_put_int32(&b, UBUS_ATTR_TARGET, id); - if (method) - blob_put_string(&b, UBUS_ATTR_METHOD, method); - - if (ubus_start_request(ctx, &req, b.head, type, 0) < 0) - return UBUS_STATUS_INVALID_ARGUMENT; - - return ubus_complete_request(ctx, &req, 0); - -} - -int ubus_watch_object_add(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id) -{ - return __ubus_watch_request(ctx, &obj->obj, id, "event", UBUS_MSG_ADD_WATCH); -} - -int ubus_watch_object_remove(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id) -{ - return __ubus_watch_request(ctx, &obj->obj, id, NULL, UBUS_MSG_REMOVE_WATCH); -} - int ubus_send_event(struct ubus_context *ctx, const char *id, struct blob_attr *data) { @@ -931,66 +547,24 @@ static void ubus_default_connection_lost(struct ubus_context *ctx) struct ubus_context *ubus_connect(const char *path) { struct ubus_context *ctx; - struct { - struct ubus_msghdr hdr; - struct blob_attr data; - } hdr; - struct blob_attr *buf; - - if (!path) - path = UBUS_UNIX_SOCKET; ctx = calloc(1, sizeof(*ctx)); if (!ctx) - goto error; - - ctx->sock.fd = usock(USOCK_UNIX, path, NULL); - if (ctx->sock.fd < 0) - goto error_free; + return NULL; + ctx->sock.fd = -1; ctx->sock.cb = ubus_handle_data; - - if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr)) - goto error_close; - - if (!ubus_validate_hdr(&hdr.hdr)) - goto error_close; - - 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)) - goto error_free_buf; - - ctx->local_id = hdr.hdr.peer; - free(buf); - ctx->connection_lost = ubus_default_connection_lost; INIT_LIST_HEAD(&ctx->requests); INIT_LIST_HEAD(&ctx->pending); avl_init(&ctx->objects, ubus_cmp_id, false, NULL); - - if (!ctx->local_id) - goto error_close; - - fcntl(ctx->sock.fd, F_SETFL, fcntl(ctx->sock.fd, F_GETFL) | O_NONBLOCK); + if (ubus_reconnect(ctx, path)) { + free(ctx); + ctx = NULL; + } return ctx; - -error_free_buf: - free(buf); -error_close: - close(ctx->sock.fd); -error_free: - free(ctx); -error: - return NULL; } void ubus_free(struct ubus_context *ctx)