[UBUS_STATUS_NOT_SUPPORTED] = "Operation not supported",
[UBUS_STATUS_UNKNOWN_ERROR] = "Unknown error",
[UBUS_STATUS_CONNECTION_FAILED] = "Connection failed",
+ [UBUS_STATUS_NO_MEMORY] = "Out of memory",
+ [UBUS_STATUS_PARSE_ERROR] = "Parsing message data failed",
+ [UBUS_STATUS_SYSTEM_ERROR] = "System error",
};
struct blob_buf b __hidden = {};
break;
}
+ ctx->stack_depth++;
ubus_process_obj_msg(ctx, buf, fd);
+ ctx->stack_depth--;
break;
case UBUS_MSG_MONITOR:
if (ctx->monitor_cb)
struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
struct ubus_pending_msg *pending;
- while (!ctx->stack_depth && !list_empty(&ctx->pending)) {
+ while (!list_empty(&ctx->pending)) {
+ if (ctx->stack_depth)
+ break;
+
pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
list_del(&pending->list);
ubus_process_msg(ctx, &pending->hdr, -1);
static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg)
{
struct ubus_lookup_request *req;
- struct ubus_object_data obj;
+ struct ubus_object_data obj = {};
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])
return;
- memset(&obj, 0, sizeof(obj));
obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
obj.type_id = blob_get_u32(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;
const char *pattern)
{
struct ubus_object *obj = &ev->obj;
- struct blob_buf b2;
+ struct blob_buf b2 = {};
int ret;
if (!obj->id) {
}
/* 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)
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;