#include <arpa/inet.h>
#include "ubusd.h"
-static struct blob_buf b;
+struct blob_buf b;
static struct ubus_msg_buf *retmsg;
static int *retmsg_data;
+static struct avl_tree clients;
static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
-typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub);
+typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr);
static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
[UBUS_ATTR_SIGNATURE] = { .type = BLOB_ATTR_NESTED },
[UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
};
-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;
return new;
}
-bool ubusd_send_hello(struct ubus_client *cl)
+static bool ubusd_send_hello(struct ubus_client *cl)
{
struct ubus_msg_buf *ub;
return false;
ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
- ubus_msg_send(cl, ub);
+ ubus_msg_send(cl, ub, true);
return true;
}
-static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
ub->hdr.type = UBUS_MSG_DATA;
- ubus_msg_send(cl, ubus_msg_ref(ub));
+ ubus_msg_send(cl, ub, false);
return 0;
}
-static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+ struct ubus_object *obj;
+
+ if (!attr[UBUS_ATTR_OBJID])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+ if (!obj)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (obj->client != cl)
+ return UBUS_STATUS_PERMISSION_DENIED;
+
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+
+ /* check if we're removing the object type as well */
+ if (obj->type && obj->type->refcount == 1)
+ blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
+
+ ubusd_free_object(obj);
+
+ ub = ubus_reply_from_blob(ub, true);
+ if (!ub)
+ return UBUS_STATUS_NO_DATA;
+
+ ubus_msg_send(cl, ub, true);
+ return 0;
+}
+
+static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
struct ubus_object *obj;
- struct blob_attr **attr;
- attr = ubus_parse_msg(ub->data);
obj = ubusd_create_object(cl, attr);
if (!obj)
return UBUS_STATUS_INVALID_ARGUMENT;
if (!ub)
return UBUS_STATUS_NO_DATA;
- ubus_msg_send(cl, ub);
+ ubus_msg_send(cl, ub, true);
return 0;
}
if (obj->path.key)
blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+ blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
list_for_each_entry(m, &obj->type->methods, list)
if (!ub)
return;
- ubus_msg_send(cl, ub);
+ ubus_msg_send(cl, ub, true);
}
-static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
struct ubus_object *obj;
- struct blob_attr **attr;
char *objpath;
bool wildcard = false;
bool found = false;
int len;
- attr = ubus_parse_msg(ub->data);
if (!attr[UBUS_ATTR_OBJPATH]) {
avl_for_each_element(&path, obj, path)
ubusd_send_obj(cl, ub, obj);
return 0;
}
-static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
struct ubus_object *obj = NULL;
- struct blob_attr **attr;
struct ubus_id *id;
const char *method;
- attr = ubus_parse_msg(ub->data);
if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
return UBUS_STATUS_INVALID_ARGUMENT;
- id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
+ id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
if (!id)
return UBUS_STATUS_NOT_FOUND;
obj = container_of(id, struct ubus_object, id);
method = blob_data(attr[UBUS_ATTR_METHOD]);
+
+ if (!obj->client)
+ return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+
blob_buf_init(&b, 0);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
blob_put_string(&b, UBUS_ATTR_METHOD, method);
ub->hdr.type = UBUS_MSG_INVOKE;
ub->hdr.peer = cl->id.id;
- ubus_msg_send(obj->client, ub);
+ ubus_msg_send(obj->client, ub, true);
return -1;
}
-static int ubusd_handle_status(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static struct ubus_client *ubusd_get_client_by_id(uint32_t id)
+{
+ struct ubus_id *clid;
+
+ clid = ubus_find_id(&clients, id);
+ if (!clid)
+ return NULL;
+
+ return container_of(clid, struct ubus_client, id);
+}
+
+static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
- struct blob_attr **attr;
struct ubus_object *obj;
- struct ubus_id *id;
- attr = ubus_parse_msg(ub->data);
- if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_STATUS])
+ if (!attr[UBUS_ATTR_OBJID] ||
+ (ub->hdr.type == UBUS_MSG_STATUS && !attr[UBUS_ATTR_STATUS]) ||
+ (ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
goto error;
- id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
- if (!id)
+ obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+ if (!obj)
goto error;
- obj = container_of(id, struct ubus_object, id);
if (cl != obj->client)
goto error;
if (!cl)
goto error;
- ub->hdr.peer = blob_get_int32(attr[UBUS_ATTR_OBJID]);
- ubus_msg_send(cl, ub);
+ ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
+ ubus_msg_send(cl, ub, true);
return -1;
error:
static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
[UBUS_MSG_PING] = ubusd_send_pong,
- [UBUS_MSG_PUBLISH] = ubusd_handle_publish,
+ [UBUS_MSG_ADD_OBJECT] = ubusd_handle_add_object,
+ [UBUS_MSG_REMOVE_OBJECT] = ubusd_handle_remove_object,
[UBUS_MSG_LOOKUP] = ubusd_handle_lookup,
[UBUS_MSG_INVOKE] = ubusd_handle_invoke,
- [UBUS_MSG_STATUS] = ubusd_handle_status,
+ [UBUS_MSG_STATUS] = ubusd_handle_response,
+ [UBUS_MSG_DATA] = ubusd_handle_response,
};
-void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
+void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
{
ubus_cmd_cb cb = NULL;
int ret;
cb = handlers[ub->hdr.type];
if (cb)
- ret = cb(cl, ub);
+ ret = cb(cl, ub, ubus_parse_msg(ub->data));
else
ret = UBUS_STATUS_INVALID_COMMAND;
ubus_msg_free(ub);
*retmsg_data = htonl(ret);
- ubus_msg_send(cl, ubus_msg_ref(retmsg));
+ ubus_msg_send(cl, retmsg, false);
+}
+
+struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
+{
+ struct ubus_client *cl;
+
+ cl = calloc(1, sizeof(*cl));
+ if (!cl)
+ return NULL;
+
+ INIT_LIST_HEAD(&cl->objects);
+ cl->sock.fd = fd;
+ cl->sock.cb = cb;
+
+ if (!ubus_alloc_id(&clients, &cl->id, 0))
+ goto free;
+
+ if (!ubusd_send_hello(cl))
+ goto delete;
+
+ return cl;
+
+delete:
+ ubus_free_id(&clients, &cl->id);
+free:
+ free(cl);
+ return NULL;
+}
+
+void ubusd_proto_free_client(struct ubus_client *cl)
+{
+ struct ubus_object *obj;
+
+ while (!list_empty(&cl->objects)) {
+ obj = list_first_entry(&cl->objects, struct ubus_object, list);
+ ubusd_free_object(obj);
+ }
+
+ ubus_free_id(&clients, &cl->id);
}
static void __init ubusd_proto_init(void)
{
+ ubus_init_id_tree(&clients);
+
blob_buf_init(&b, 0);
blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
projects / project / ubus.git / blobdiff