#include <sys/types.h>
#include <sys/uio.h>
#include <sys/socket.h>
+#include <fcntl.h>
#include <unistd.h>
#include <libubox/blob.h>
#include "libubus.h"
#include "ubusmsg.h"
-#define DEBUG 1
-
-#ifdef DEBUG
-#define DPRINTF(_format, ...) fprintf(stderr, "ubus: " _format, ## __VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
#define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) }
const char *__ubus_strerror[__UBUS_STATUS_LAST] = {
[UBUS_STATUS_NOT_FOUND] = "Not found",
[UBUS_STATUS_NO_DATA] = "No response",
[UBUS_STATUS_PERMISSION_DENIED] = "Permission denied",
+ [UBUS_STATUS_TIMEOUT] = "Request timed out",
};
static struct blob_buf b;
return err;
}
+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:
+ /* turn off non-blocking mode */
+ fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) &
+ ~O_NONBLOCK);
+ 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)
{
iov[1].iov_base = (char *) msg;
iov[1].iov_len = blob_raw_len(msg);
- return writev(ctx->sock.fd, iov, 2);
+ return writev_retry(ctx->sock.fd, iov, ARRAY_SIZE(iov));
}
static int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
{
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;
if (errno == EINTR)
continue;
- if (errno != EAGAIN) {
- perror("read");
+ if (errno != EAGAIN)
return false;
- }
}
if (!wait && !bytes)
return false;
if (blob_raw_len(hdr->data) < sizeof(*hdr->data))
return false;
- if (blob_raw_len(hdr->data) + sizeof(*hdr) > UBUS_MAX_MSGLEN)
+ if (blob_pad_len(hdr->data) > UBUS_MAX_MSGLEN)
return false;
return true;
}
-static bool get_next_msg(struct ubus_context *ctx, bool wait)
+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, wait))
+ if (!recv_retry(ctx->sock.fd, &iov, false))
return false;
iov.iov_len = blob_len(ctx->msgbuf.hdr.data);
if (!attrbuf[UBUS_ATTR_STATUS])
return false;
- *ret = blob_get_int32(attrbuf[UBUS_ATTR_STATUS]);
+ *ret = blob_get_u32(attrbuf[UBUS_ATTR_STATUS]);
return true;
}
if (!attrbuf[UBUS_ATTR_OBJID])
return;
- objid = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
+ objid = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
if (!attrbuf[UBUS_ATTR_METHOD]) {
ret = UBUS_STATUS_INVALID_ARGUMENT;
req.peer = hdr->peer;
req.seq = hdr->seq;
ret = obj->methods[method].handler(ctx, obj, &req,
- obj->methods[method].name,
+ blob_data(attrbuf[UBUS_ATTR_METHOD]),
attrbuf[UBUS_ATTR_DATA]);
send:
case UBUS_MSG_INVOKE:
ubus_process_invoke(ctx, hdr);
break;
- default:
- DPRINTF("unknown message type: %d\n", hdr->type);
- break;
}
}
struct ubus_context *ctx = container_of(u, struct ubus_context, sock);
struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
- while (get_next_msg(ctx, false))
+ while (get_next_msg(ctx)) {
ubus_process_msg(ctx, hdr);
+ if (uloop_cancelled)
+ break;
+ }
if (u->eof)
ctx->connection_lost(ctx);
}
-int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req)
+static void ubus_sync_req_cb(struct ubus_request *req, int ret)
{
- struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
-
- if (!list_empty(&req->list))
- list_del(&req->list);
+ req->status_msg = true;
+ req->status_code = ret;
+ uloop_end();
+}
- while (1) {
- if (req->status_msg)
- return req->status_code;
+struct ubus_sync_req_cb {
+ struct uloop_timeout timeout;
+ struct ubus_request *req;
+};
- if (req->cancelled)
- return UBUS_STATUS_NO_DATA;
+static void ubus_sync_req_timeout_cb(struct uloop_timeout *timeout)
+{
+ struct ubus_sync_req_cb *cb;
- if (!get_next_msg(ctx, true))
- return UBUS_STATUS_NO_DATA;
+ cb = container_of(timeout, struct ubus_sync_req_cb, timeout);
+ ubus_sync_req_cb(cb->req, UBUS_STATUS_TIMEOUT);
+}
- if (hdr->seq != req->seq || hdr->peer != req->peer)
- goto skip;
+int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
+ int timeout)
+{
+ struct ubus_sync_req_cb cb;
+ ubus_complete_handler_t complete_cb = req->complete_cb;
+ bool registered = ctx->sock.registered;
+ bool cancelled = uloop_cancelled;
+ int status = UBUS_STATUS_NO_DATA;
- switch(hdr->type) {
- case UBUS_MSG_STATUS:
- return ubus_process_req_status(req, hdr);
- case UBUS_MSG_DATA:
- if (req->data_cb || req->raw_data_cb)
- ubus_req_data(req, hdr);
- continue;
- default:
- goto skip;
- }
+ if (!registered) {
+ uloop_init();
+ ubus_add_uloop(ctx);
+ }
-skip:
- ubus_process_msg(ctx, hdr);
+ if (timeout) {
+ memset(&cb, 0, sizeof(cb));
+ cb.req = req;
+ cb.timeout.cb = ubus_sync_req_timeout_cb;
+ uloop_timeout_set(&cb.timeout, timeout);
}
+
+ ubus_complete_request_async(ctx, req);
+ req->complete_cb = ubus_sync_req_cb;
+
+ uloop_run();
+
+ if (timeout)
+ uloop_timeout_cancel(&cb.timeout);
+
+ if (req->status_msg)
+ status = req->status_code;
+
+ req->complete_cb = complete_cb;
+ if (req->complete_cb)
+ req->complete_cb(req, status);
+
+ uloop_cancelled = cancelled;
+ if (!registered)
+ uloop_fd_delete(&ctx->sock);
+
+ return status;
}
struct ubus_lookup_request {
return;
memset(&obj, 0, sizeof(obj));
- obj.id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+ obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
- obj.type_id = blob_get_int32(attr[UBUS_ATTR_OBJTYPE]);
+ obj.type_id = blob_get_u32(attr[UBUS_ATTR_OBJTYPE]);
obj.signature = attr[UBUS_ATTR_SIGNATURE];
req->cb(ureq->ctx, &obj, ureq->priv);
}
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);
+
+ if (ubus_start_request(ctx, &lookup.req, b.head, UBUS_MSG_LOOKUP, 0) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
lookup.req.raw_data_cb = ubus_lookup_cb;
lookup.req.priv = priv;
lookup.cb = cb;
- return ubus_complete_request(ctx, &lookup.req);
+ return ubus_complete_request(ctx, &lookup.req, 0);
}
static void ubus_lookup_id_cb(struct ubus_request *req, int type, struct blob_attr *msg)
if (!attr[UBUS_ATTR_OBJID])
return;
- *id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+ *id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
}
int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id)
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);
+
+ if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
req.raw_data_cb = ubus_lookup_id_cb;
req.priv = id;
- return ubus_complete_request(ctx, &req);
+ return ubus_complete_request(ctx, &req, 0);
}
int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
return 0;
}
-void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
+int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
struct blob_attr *msg, struct ubus_request *req)
{
blob_buf_init(&b, 0);
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);
+ if (ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ return 0;
}
int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
- struct blob_attr *msg, ubus_data_handler_t cb, void *priv)
+ struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
+ int timeout)
{
struct ubus_request req;
ubus_invoke_async(ctx, obj, method, msg, &req);
req.data_cb = cb;
req.priv = priv;
- return ubus_complete_request(ctx, &req);
+ return ubus_complete_request(ctx, &req, timeout);
}
static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
if (!attrbuf[UBUS_ATTR_OBJID])
return;
- obj->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
+ obj->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
if (attrbuf[UBUS_ATTR_OBJTYPE])
- obj->type->id = blob_get_int32(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);
return UBUS_STATUS_INVALID_ARGUMENT;
}
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_ADD_OBJECT, 0);
+ 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);
+ ret = ubus_complete_request(ctx, &req, 0);
if (ret)
return ret;
return __ubus_add_object(ctx, obj);
}
+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,
const char *method, struct blob_attr *msg)
if (pattern)
blobmsg_add_string(&b2, "pattern", pattern);
- ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
- NULL, NULL);
-
- return 0;
+ return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+ NULL, NULL, 0);
}
+int ubus_send_event(struct ubus_context *ctx, const char *id,
+ struct blob_attr *data)
+{
+ struct ubus_request req;
+ void *s;
+
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, UBUS_SYSTEM_OBJECT_EVENT);
+ blob_put_string(&b, UBUS_ATTR_METHOD, "send");
+ s = blob_nest_start(&b, UBUS_ATTR_DATA);
+ blobmsg_add_string(&b, "id", id);
+ blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "data", blob_data(data), blob_len(data));
+ blob_nest_end(&b, s);
+
+ if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, UBUS_SYSTEM_OBJECT_EVENT) < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ return ubus_complete_request(ctx, &req, 0);
+}
-void ubus_default_connection_lost(struct ubus_context *ctx)
+static void ubus_default_connection_lost(struct ubus_context *ctx)
{
if (ctx->sock.registered)
uloop_end();