struct ubus_pending_msg {
struct list_head list;
- struct ubus_msghdr hdr;
+ struct ubus_msghdr_buf hdr;
};
static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
}
static void
-ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
+ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
{
struct ubus_pending_msg *pending;
+ void *data;
- pending = calloc(1, sizeof(*pending) + blob_raw_len(ubus_msghdr_data(hdr)));
- if (!pending)
- return;
+ pending = calloc_a(sizeof(*pending), &data, blob_raw_len(buf->data));
- memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr)));
- list_add(&pending->list, &ctx->pending);
+ pending->hdr.data = data;
+ memcpy(&pending->hdr.hdr, &buf->hdr, sizeof(buf->hdr));
+ memcpy(data, buf->data, blob_raw_len(buf->data));
+ list_add_tail(&pending->list, &ctx->pending);
if (ctx->sock.registered)
uloop_timeout_set(&ctx->pending_timer, 1);
}
void __hidden
-ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
+ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
{
-
- switch(hdr->type) {
+ switch(buf->hdr.type) {
case UBUS_MSG_STATUS:
case UBUS_MSG_DATA:
- ubus_process_req_msg(ctx, hdr, fd);
+ ubus_process_req_msg(ctx, buf, fd);
break;
case UBUS_MSG_INVOKE:
case UBUS_MSG_UNSUBSCRIBE:
case UBUS_MSG_NOTIFY:
if (ctx->stack_depth) {
- ubus_queue_msg(ctx, hdr);
+ ubus_queue_msg(ctx, buf);
break;
}
- ubus_process_obj_msg(ctx, hdr);
+ ubus_process_obj_msg(ctx, buf, fd);
+ break;
+ case UBUS_MSG_MONITOR:
+ if (ctx->monitor_cb)
+ ctx->monitor_cb(ctx, buf->hdr.seq, buf->data);
break;
}
}
if (pattern)
blobmsg_add_string(&b2, "pattern", pattern);
- return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+ ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
NULL, NULL, 0);
+ blob_buf_free(&b2);
+
+ return ret;
}
int ubus_send_event(struct ubus_context *ctx, const char *id,
uloop_end();
}
-static int _ubus_connect(struct ubus_context *ctx, const char *path)
+int ubus_connect_ctx(struct ubus_context *ctx, const char *path)
{
+ uloop_init();
+ memset(ctx, 0, sizeof(*ctx));
+
ctx->sock.fd = -1;
ctx->sock.cb = ubus_handle_data;
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));
+ if (!ctx->msgbuf.data)
+ return -1;
+ ctx->msgbuf_data_len = UBUS_MSG_CHUNK_SIZE;
+
INIT_LIST_HEAD(&ctx->requests);
INIT_LIST_HEAD(&ctx->pending);
avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
- if (ubus_reconnect(ctx, path))
+ if (ubus_reconnect(ctx, path)) {
+ free(ctx->msgbuf.data);
+ ctx->msgbuf.data = NULL;
return -1;
+ }
return 0;
}
{
struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
- if (_ubus_connect(&conn->ctx, conn->path)) {
+ if (ubus_connect_ctx(&conn->ctx, conn->path)) {
uloop_timeout_set(timeout, 1000);
fprintf(stderr, "failed to connect to ubus\n");
return;
if (!ctx)
return NULL;
- if (_ubus_connect(ctx, path)) {
+ if (ubus_connect_ctx(ctx, path)) {
free(ctx);
ctx = NULL;
}
return ctx;
}
-void ubus_free(struct ubus_context *ctx)
+void ubus_shutdown(struct ubus_context *ctx)
{
blob_buf_free(&b);
+ if (!ctx)
+ return;
close(ctx->sock.fd);
+ uloop_timeout_cancel(&ctx->pending_timer);
+ free(ctx->msgbuf.data);
+}
+
+void ubus_free(struct ubus_context *ctx)
+{
+ ubus_shutdown(ctx);
free(ctx);
}