static void ubus_process_pending_msg(struct uloop_timeout *timeout)
{
struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
- struct ubus_pending_msg *pending;
+ struct ubus_pending_msg *pending, *tmp;
+
+ list_for_each_entry_safe(pending, tmp, &ctx->pending, list) {
+ if (ctx->stack_depth)
+ break;
- while (!ctx->stack_depth && !list_empty(&ctx->pending)) {
- pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
list_del(&pending->list);
ubus_process_msg(ctx, &pending->hdr, -1);
free(pending);
struct blob_attr **attr;
req = container_of(ureq, struct ubus_lookup_request, req);
- attr = ubus_parse_msg(msg);
+ attr = ubus_parse_msg(msg, blob_raw_len(msg));
if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH] ||
!attr[UBUS_ATTR_OBJTYPE])
struct blob_attr **attr;
uint32_t *id = req->priv;
- attr = ubus_parse_msg(msg);
+ attr = ubus_parse_msg(msg, blob_raw_len(msg));
if (!attr[UBUS_ATTR_OBJID])
return;
ctx->connection_lost = ubus_default_connection_lost;
ctx->pending_timer.cb = ubus_process_pending_msg;
- ctx->msgbuf.data = calloc(UBUS_MSG_CHUNK_SIZE, sizeof(char));
+ ctx->msgbuf.data = calloc(1, UBUS_MSG_CHUNK_SIZE);
if (!ctx->msgbuf.data)
return -1;
ctx->msgbuf_data_len = UBUS_MSG_CHUNK_SIZE;