struct blob_attr data[];
};
+static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
+{
+ const uint32_t *id1 = k1, *id2 = k2;
+
+ if (*id1 < *id2)
+ return -1;
+ else
+ return *id1 > *id2;
+}
+
struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
{
blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
INIT_LIST_HEAD(&req->list);
INIT_LIST_HEAD(&req->pending);
+ req->ctx = ctx;
req->peer = peer;
req->seq = ++ctx->request_seq;
return ubus_send_msg(ctx, req->seq, msg, cmd, peer);
if (attrbuf[UBUS_ATTR_OBJTYPE])
obj->type->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJTYPE]);
+
+ obj->avl.key = &obj->id;
+ avl_insert(&req->ctx->objects, &obj->avl);
}
static bool ubus_push_table_data(const struct ubus_signature **sig, int *rem, bool array)
blob_buf_init(&b, 0);
blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->name);
- if (obj->parent)
- blob_put_int32(&b, UBUS_ATTR_OBJID, obj->parent->id);
if (obj->type->id)
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id);
}
ctx->local_id = hdr.hdr.peer;
- INIT_LIST_HEAD(&ctx->requests);
free(buf);
+ INIT_LIST_HEAD(&ctx->requests);
+ avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
+
if (!ctx->local_id) {
DPRINTF("Failed to get local peer id\n");
goto error_close;
+#include <libubox/avl.h>
#include <libubox/list.h>
#include <libubox/blobmsg.h>
#include <libubox/uloop.h>
};
struct ubus_object {
+ struct avl_node avl;
+
const char *name;
uint32_t id;
const char *path;
- struct ubus_object *parent;
-
struct ubus_object_type *type;
};
struct ubus_context {
struct list_head requests;
- struct list_head objects;
+ struct avl_tree objects;
+
struct uloop_fd sock;
uint32_t local_id;
ubus_data_handler_t data_cb;
ubus_complete_handler_t complete_cb;
+ struct ubus_context *ctx;
void *priv;
};