/*
- * Copyright (C) 2011-2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2011-2014 Felix Fietkau <nbd@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1
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)
{
struct ubus_pending_msg *pending;
- pending = calloc(1, sizeof(*pending) + blob_raw_len(hdr->data));
+ pending = calloc(1, sizeof(*pending));
if (!pending)
return;
+ pending->hdr.data = calloc(1, blob_raw_len(ubus_msghdr_data(hdr)));
+ if (!pending->hdr.data)
+ return;
- memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(hdr->data));
+ memcpy(&pending->hdr.hdr, hdr, sizeof(*hdr));
+ memcpy(pending->hdr.data, ubus_msghdr_data(hdr), blob_raw_len(ubus_msghdr_data(hdr)));
list_add(&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)
+ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
{
switch(hdr->type) {
case UBUS_MSG_STATUS:
case UBUS_MSG_DATA:
- ubus_process_req_msg(ctx, hdr);
+ ubus_process_req_msg(ctx, hdr, fd);
break;
case UBUS_MSG_INVOKE:
case UBUS_MSG_UNSUBSCRIBE:
case UBUS_MSG_NOTIFY:
- if (ctx->stack_depth > 2) {
+ if (ctx->stack_depth) {
ubus_queue_msg(ctx, hdr);
break;
}
}
}
-void __hidden ubus_process_pending_msg(struct ubus_context *ctx)
+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;
- while (!list_empty(&ctx->pending)) {
+ 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);
+ ubus_process_msg(ctx, &pending->hdr.hdr, -1);
+ free(pending->hdr.data);
free(pending);
- if (ctx->stack_depth > 2)
- break;
}
}
uloop_end();
}
-struct ubus_context *ubus_connect(const char *path)
+static int _ubus_connect(struct ubus_context *ctx, const char *path)
{
- struct ubus_context *ctx;
-
- ctx = calloc(1, sizeof(*ctx));
- if (!ctx)
- return NULL;
-
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)) {
+ free(ctx->msgbuf.data);
+ return -1;
+ }
+
+ return 0;
+}
+
+static void ubus_auto_reconnect_cb(struct uloop_timeout *timeout)
+{
+ struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
+
+ if (!ubus_reconnect(&conn->ctx, conn->path))
+ ubus_add_uloop(&conn->ctx);
+ else
+ uloop_timeout_set(timeout, 1000);
+}
+
+static void ubus_auto_disconnect_cb(struct ubus_context *ctx)
+{
+ struct ubus_auto_conn *conn = container_of(ctx, struct ubus_auto_conn, ctx);
+
+ conn->timer.cb = ubus_auto_reconnect_cb;
+ uloop_timeout_set(&conn->timer, 1000);
+}
+
+static void ubus_auto_connect_cb(struct uloop_timeout *timeout)
+{
+ struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
+
+ if (_ubus_connect(&conn->ctx, conn->path)) {
+ uloop_timeout_set(timeout, 1000);
+ fprintf(stderr, "failed to connect to ubus\n");
+ return;
+ }
+ conn->ctx.connection_lost = ubus_auto_disconnect_cb;
+ if (conn->cb)
+ conn->cb(&conn->ctx);
+ ubus_add_uloop(&conn->ctx);
+}
+
+void ubus_auto_connect(struct ubus_auto_conn *conn)
+{
+ conn->timer.cb = ubus_auto_connect_cb;
+ ubus_auto_connect_cb(&conn->timer);
+}
+
+struct ubus_context *ubus_connect(const char *path)
+{
+ struct ubus_context *ctx;
+
+ ctx = calloc(1, sizeof(*ctx));
+ if (!ctx)
+ return NULL;
+
+ if (_ubus_connect(ctx, path)) {
free(ctx);
ctx = NULL;
}
void ubus_free(struct ubus_context *ctx)
{
+ blob_buf_free(&b);
close(ctx->sock.fd);
+ free(ctx->msgbuf.data);
free(ctx);
}