projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubus: remove ubus_msghdr_data() by passing in the right data structure pointer
[project/ubus.git]
/
libubus.c
diff --git
a/libubus.c
b/libubus.c
index
e435200
..
18267bb
100644
(file)
--- a/
libubus.c
+++ b/
libubus.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011-201
2
Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2011-201
4
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
*
* 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
@@
-40,7
+40,7
@@
struct blob_buf b __hidden = {};
struct ubus_pending_msg {
struct list_head list;
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 int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
@@
-71,52
+71,53
@@
out:
}
static void
}
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;
{
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)));
+ pending->hdr.data = data;
+ memcpy(&pending->hdr.hdr, &buf->hdr, sizeof(buf->hdr));
+ memcpy(data, buf->data, blob_raw_len(buf->data));
list_add(&pending->list, &ctx->pending);
list_add(&pending->list, &ctx->pending);
+ if (ctx->sock.registered)
+ uloop_timeout_set(&ctx->pending_timer, 1);
}
void __hidden
}
void __hidden
-ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr
*hdr
)
+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:
case UBUS_MSG_STATUS:
case UBUS_MSG_DATA:
- ubus_process_req_msg(ctx,
hdr
);
+ ubus_process_req_msg(ctx,
buf, fd
);
break;
case UBUS_MSG_INVOKE:
case UBUS_MSG_UNSUBSCRIBE:
case UBUS_MSG_NOTIFY:
break;
case UBUS_MSG_INVOKE:
case UBUS_MSG_UNSUBSCRIBE:
case UBUS_MSG_NOTIFY:
- if (ctx->stack_depth
> 2
) {
- ubus_queue_msg(ctx,
hdr
);
+ if (ctx->stack_depth) {
+ ubus_queue_msg(ctx,
buf
);
break;
}
break;
}
- ubus_process_obj_msg(ctx,
hdr
);
+ ubus_process_obj_msg(ctx,
buf
);
break;
}
}
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;
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);
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
, -1
);
free(pending);
free(pending);
- if (ctx->stack_depth > 2)
- break;
}
}
}
}
@@
-237,8
+238,11
@@
int ubus_register_event_handler(struct ubus_context *ctx,
if (pattern)
blobmsg_add_string(&b2, "pattern", pattern);
if (pattern)
blobmsg_add_string(&b2, "pattern", pattern);
- ret
urn
ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+ ret
=
ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
NULL, NULL, 0);
NULL, NULL, 0);
+ blob_buf_free(&b2);
+
+ return ret;
}
int ubus_send_event(struct ubus_context *ctx, const char *id,
}
int ubus_send_event(struct ubus_context *ctx, const char *id,
@@
-272,12
+276,20
@@
static int _ubus_connect(struct ubus_context *ctx, const char *path)
ctx->sock.fd = -1;
ctx->sock.cb = ubus_handle_data;
ctx->connection_lost = ubus_default_connection_lost;
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);
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);
return -1;
return -1;
+ }
return 0;
}
return 0;
}
@@
-341,5
+353,6
@@
void ubus_free(struct ubus_context *ctx)
{
blob_buf_free(&b);
close(ctx->sock.fd);
{
blob_buf_free(&b);
close(ctx->sock.fd);
+ free(ctx->msgbuf.data);
free(ctx);
}
free(ctx);
}