DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libubus: expose ubus_connect_ctx() in public API

Browse source 
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 <dbrignoli@audioscience.com>
This commit is contained in:
Delio Brignoli 2014-10-01 19:57:56 +02:00 committed by Felix Fietkau
parent 4c4f35cf22
commit 7b79b6226e
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libubus.c
View file

@ -271,8 +271,10 @@ static void ubus_default_connection_lost(struct ubus_context *ctx)
uloop_end(); 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.fd = -1;
ctx->sock.cb = ubus_handle_data; ctx->sock.cb = ubus_handle_data;
ctx->connection_lost = ubus_default_connection_lost; 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); 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); uloop_timeout_set(timeout, 1000);
fprintf(stderr, "failed to connect to ubus\n"); fprintf(stderr, "failed to connect to ubus\n");
return; return;
@ -341,7 +343,7 @@ struct ubus_context *ubus_connect(const char *path)
if (!ctx) if (!ctx)
return NULL; return NULL;
if (_ubus_connect(ctx, path)) { if (ubus_connect_ctx(ctx, path)) {
free(ctx); free(ctx);
ctx = NULL; ctx = NULL;
} }
@ -349,10 +351,15 @@ struct ubus_context *ubus_connect(const char *path)
return ctx; return ctx;
} }
void ubus_free(struct ubus_context *ctx) void ubus_shutdown(struct ubus_context *ctx)
{ {
blob_buf_free(&b); blob_buf_free(&b);
close(ctx->sock.fd); close(ctx->sock.fd);
free(ctx->msgbuf.data); free(ctx->msgbuf.data);
}
void ubus_free(struct ubus_context *ctx)
{
ubus_shutdown(ctx);
free(ctx); free(ctx);
} }

6
libubus.h
View file

@ -209,10 +209,16 @@ struct ubus_auto_conn {
}; };
struct ubus_context *ubus_connect(const char *path); 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); void ubus_auto_connect(struct ubus_auto_conn *conn);
int ubus_reconnect(struct ubus_context *ctx, const char *path); 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); 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); const char *ubus_strerror(int error);
static inline void ubus_add_uloop(struct ubus_context *ctx) static inline void ubus_add_uloop(struct ubus_context *ctx)