#include "ubusd.h"
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];
[UBUS_ATTR_GROUP] = { .type = BLOB_ATTR_STRING },
};
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg, size_t len)
{
- blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
+ blob_parse_untrusted(msg, len, attrbuf, ubus_policy, UBUS_ATTR_MAX);
return attrbuf;
}
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;
+ goto out;
obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
if (!obj)
- goto error;
+ goto out;
if (cl != obj->client)
- goto error;
+ goto out;
cl = ubusd_get_client_by_id(ub->hdr.peer);
if (!cl)
- goto error;
+ goto out;
ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
ubus_msg_send(cl, ub);
-error:
+out:
return -1;
}
{
ubus_cmd_cb cb = NULL;
int ret;
+ struct ubus_msg_buf *retmsg = cl->retmsg;
+ int *retmsg_data = blob_data(blob_data(retmsg->data));
retmsg->hdr.seq = ub->hdr.seq;
retmsg->hdr.peer = ub->hdr.peer;
/* Note: no callback should free the `ub` buffer
that's always done right after the callback finishes */
if (cb)
- ret = cb(cl, ub, ubus_parse_msg(ub->data));
+ ret = cb(cl, ub, ubus_parse_msg(ub->data, blob_raw_len(ub->data)));
else
ret = UBUS_STATUS_INVALID_COMMAND;
ubus_msg_send(cl, retmsg);
}
+static int ubusd_proto_init_retmsg(struct ubus_client *cl)
+{
+ struct blob_buf *b = &cl->b;
+
+ blob_buf_init(&cl->b, 0);
+ blob_put_int32(&cl->b, UBUS_ATTR_STATUS, 0);
+
+ /* we make the 'retmsg' buffer shared with the blob_buf b, to reduce mem duplication */
+ cl->retmsg = ubus_msg_new(b->head, blob_raw_len(b->head), true);
+ if (!cl->retmsg)
+ return -1;
+
+ cl->retmsg->hdr.type = UBUS_MSG_STATUS;
+ return 0;
+}
+
struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
{
struct ubus_client *cl;
goto free;
INIT_LIST_HEAD(&cl->objects);
+ INIT_LIST_HEAD(&cl->tx_queue);
cl->sock.fd = fd;
cl->sock.cb = cb;
cl->pending_msg_fd = -1;
if (!ubus_alloc_id(&clients, &cl->id, 0))
goto free;
+ if (ubusd_proto_init_retmsg(cl))
+ goto free;
+
if (!ubusd_send_hello(cl))
goto delete;
void ubusd_proto_free_client(struct ubus_client *cl)
{
- struct ubus_object *obj;
+ struct ubus_object *obj, *tmp;
- while (!list_empty(&cl->objects)) {
- obj = list_first_entry(&cl->objects, struct ubus_object, list);
+ list_for_each_entry_safe(obj, tmp, &cl->objects, list) {
ubusd_free_object(obj);
}
+ ubus_msg_free(cl->retmsg);
+ blob_buf_free(&cl->b);
+
ubusd_acl_free_client(cl);
ubus_free_id(&clients, &cl->id);
}
static void __constructor ubusd_proto_init(void)
{
ubus_init_id_tree(&clients);
-
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
-
- retmsg = ubus_msg_from_blob(false);
- if (!retmsg)
- exit(1);
-
- retmsg->hdr.type = UBUS_MSG_STATUS;
- retmsg_data = blob_data(blob_data(retmsg->data));
}