From 7b79b6226e737e28aafb4e9b668b86b5f180314b Mon Sep 17 00:00:00 2001 From: Delio Brignoli Date: Wed, 1 Oct 2014 19:57:56 +0200 Subject: [PATCH] libubus: expose ubus_connect_ctx() in public API ubus_connect_ctx() is equivalent to ubus_connect() but accepts a pointer to a previously allocated ubus_context struct. ubus_shutdown() is made available as an alternative to ubus_free() to clean up contexts initialised by ubus_connect_ctx(). Signed-off-by: Delio Brignoli --- libubus.c | 15 +++++++++++---- libubus.h | 6 ++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/libubus.c b/libubus.c index 18267bb..ccaa069 100644 --- a/libubus.c +++ b/libubus.c @@ -271,8 +271,10 @@ static void ubus_default_connection_lost(struct ubus_context *ctx) uloop_end(); } -static int _ubus_connect(struct ubus_context *ctx, const char *path) +int ubus_connect_ctx(struct ubus_context *ctx, const char *path) { + memset(ctx, 0, sizeof(*ctx)); + ctx->sock.fd = -1; ctx->sock.cb = ubus_handle_data; ctx->connection_lost = ubus_default_connection_lost; @@ -316,7 +318,7 @@ 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)) { + if (ubus_connect_ctx(&conn->ctx, conn->path)) { uloop_timeout_set(timeout, 1000); fprintf(stderr, "failed to connect to ubus\n"); return; @@ -341,7 +343,7 @@ struct ubus_context *ubus_connect(const char *path) if (!ctx) return NULL; - if (_ubus_connect(ctx, path)) { + if (ubus_connect_ctx(ctx, path)) { free(ctx); ctx = NULL; } @@ -349,10 +351,15 @@ struct ubus_context *ubus_connect(const char *path) return ctx; } -void ubus_free(struct ubus_context *ctx) +void ubus_shutdown(struct ubus_context *ctx) { blob_buf_free(&b); close(ctx->sock.fd); free(ctx->msgbuf.data); +} + +void ubus_free(struct ubus_context *ctx) +{ + ubus_shutdown(ctx); free(ctx); } diff --git a/libubus.h b/libubus.h index 94e5f95..08dac49 100644 --- a/libubus.h +++ b/libubus.h @@ -209,10 +209,16 @@ struct ubus_auto_conn { }; struct ubus_context *ubus_connect(const char *path); +int ubus_connect_ctx(struct ubus_context *ctx, const char *path); void ubus_auto_connect(struct ubus_auto_conn *conn); int ubus_reconnect(struct ubus_context *ctx, const char *path); + +/* call this only for struct ubus_context pointers returned by ubus_connect() */ void ubus_free(struct ubus_context *ctx); +/* call this only for struct ubus_context pointers initialised by ubus_connect_ctx() */ +void ubus_shutdown(struct ubus_context *ctx); + const char *ubus_strerror(int error); static inline void ubus_add_uloop(struct ubus_context *ctx)