#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_METHOD_NOT_FOUND] = "Method not found",
[UBUS_STATUS_NOT_FOUND] = "Not found",
[UBUS_STATUS_NO_DATA] = "No response",
+ [UBUS_STATUS_PERMISSION_DENIED] = "Permission denied",
};
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;
bytes = read(fd, iov->iov_base, iov->iov_len);
if (bytes < 0) {
bytes = 0;
+ if (uloop_cancelled)
+ return false;
if (errno == EINTR)
continue;
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;
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;
}
for (method = 0; method < obj->n_methods; method++)
- if (!strcmp(obj->methods[method].name,
+ if (!obj->methods[method].name ||
+ !strcmp(obj->methods[method].name,
blob_data(attrbuf[UBUS_ATTR_METHOD])))
goto found;
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;
}
}
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;
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 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,
return ubus_complete_request(ctx, &req);
}
-static void ubus_publish_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
{
struct ubus_object *obj = req->priv;
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 true;
}
-int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+static int __ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
{
struct ubus_request req;
int ret;
- if (obj->id || !obj->name || !obj->type)
+ 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);
+ if (ret)
+ return ret;
+
+ if (!obj->id)
+ return UBUS_STATUS_NO_DATA;
+
+ return 0;
+}
+
+int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
+{
+ if (!obj->name || !obj->type)
return UBUS_STATUS_INVALID_ARGUMENT;
+ 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_string(&b, UBUS_ATTR_OBJPATH, obj->name);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id);
- if (obj->type->id)
- blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id);
- else if (!ubus_push_object_type(obj->type))
+ if (ubus_start_request(ctx, &req, b.head, UBUS_MSG_REMOVE_OBJECT, 0) < 0)
return UBUS_STATUS_INVALID_ARGUMENT;
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_PUBLISH, 0);
- req.raw_data_cb = ubus_publish_cb;
+ req.raw_data_cb = ubus_remove_object_cb;
req.priv = obj;
ret = ubus_complete_request(ctx, &req);
if (ret)
return ret;
- if (!obj->id)
+ if (obj->id)
return UBUS_STATUS_NO_DATA;
return 0;
}
-void ubus_default_connection_lost(struct ubus_context *ctx)
+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)
+{
+ struct ubus_event_handler *ev;
+
+ ev = container_of(obj, struct ubus_event_handler, obj);
+ ev->cb(ctx, ev, method, msg);
+ return 0;
+}
+
+static const struct ubus_method event_method = {
+ .name = NULL,
+ .handler = ubus_event_cb,
+};
+
+int ubus_register_event_handler(struct ubus_context *ctx,
+ struct ubus_event_handler *ev,
+ const char *pattern)
+{
+ struct ubus_object *obj = &ev->obj;
+ struct blob_buf b2;
+ int ret;
+
+ if (!obj->id) {
+ obj->methods = &event_method;
+ obj->n_methods = 1;
+
+ if (!!obj->name ^ !!obj->type)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ ret = __ubus_add_object(ctx, obj);
+ if (ret)
+ return ret;
+ }
+
+ /* use a second buffer, ubus_invoke() overwrites the primary one */
+ memset(&b2, 0, sizeof(b2));
+ blob_buf_init(&b2, 0);
+ blobmsg_add_u32(&b2, "object", obj->id);
+ if (pattern)
+ blobmsg_add_string(&b2, "pattern", pattern);
+
+ return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+ NULL, NULL);
+}
+
+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);
+}
+
+static void ubus_default_connection_lost(struct ubus_context *ctx)
{
if (ctx->sock.registered)
uloop_end();