+/*
+ * Copyright (C) 2011 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
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include <unistd.h>
#include "libubus.h"
static struct ubus_context *ctx;
-struct blob_buf b;
-
-static const struct ubus_signature test_object_sig[] = {
- UBUS_METHOD_START("hello"),
- UBUS_ARRAY("test"),
- UBUS_TABLE_START(NULL),
- UBUS_FIELD(INT32, "id"),
- UBUS_FIELD(STRING, "msg"),
- UBUS_TABLE_END(),
- UBUS_METHOD_END(),
-};
-
-static struct ubus_object_type test_object_type =
- UBUS_OBJECT_TYPE("test", test_object_sig);
+static struct ubus_watch_object test_event;
+static struct blob_buf b;
enum {
HELLO_ID,
HELLO_MSG,
- HELLO_LAST
+ __HELLO_MAX
};
static const struct blobmsg_policy hello_policy[] = {
[HELLO_MSG] = { .name = "msg", .type = BLOBMSG_TYPE_STRING },
};
+struct hello_request {
+ struct ubus_request_data req;
+ struct uloop_timeout timeout;
+ char data[];
+};
+
+static void test_hello_reply(struct uloop_timeout *t)
+{
+ struct hello_request *req = container_of(t, struct hello_request, timeout);
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "message", req->data);
+ ubus_send_reply(ctx, &req->req, b.head);
+ ubus_complete_deferred_request(ctx, &req->req, 0);
+ free(req);
+}
+
static int test_hello(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- struct blob_attr *tb[HELLO_LAST];
- char *msgstr = "(unknown)";
- char *strbuf;
+ struct hello_request *hreq;
+ struct blob_attr *tb[__HELLO_MAX];
+ const char *format = "%s received a message: %s";
+ const char *msgstr = "(unknown)";
blobmsg_parse(hello_policy, ARRAY_SIZE(hello_policy), tb, blob_data(msg), blob_len(msg));
if (tb[HELLO_MSG])
msgstr = blobmsg_data(tb[HELLO_MSG]);
- blob_buf_init(&b, 0);
- strbuf = blobmsg_alloc_string_buffer(&b, "message", 64 + strlen(obj->name) + strlen(msgstr));
- sprintf(strbuf, "%s: Hello, world: %s", obj->name, msgstr);
- blobmsg_add_string_buffer(&b);
- ubus_send_reply(ctx, req, b.head);
+ hreq = calloc(1, sizeof(*hreq) + strlen(format) + strlen(obj->name) + strlen(msgstr) + 1);
+ sprintf(hreq->data, format, obj->name, msgstr);
+ ubus_defer_request(ctx, req, &hreq->req);
+ hreq->timeout.cb = test_hello_reply;
+ uloop_timeout_set(&hreq->timeout, 1000);
+
return 0;
}
+enum {
+ WATCH_ID,
+ __WATCH_MAX
+};
+
+static const struct blobmsg_policy watch_policy[__WATCH_MAX] = {
+ [WATCH_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
+};
+
+static void test_handle_event(struct ubus_context *ctx, struct ubus_watch_object *w,
+ uint32_t id)
+{
+ fprintf(stderr, "Object %08x went away\n", id);
+}
+
+static int test_watch(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct blob_attr *tb[__WATCH_MAX];
+ int ret;
+
+ blobmsg_parse(watch_policy, __WATCH_MAX, tb, blob_data(msg), blob_len(msg));
+ if (!tb[WATCH_ID])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ test_event.cb = test_handle_event;
+ ret = ubus_watch_object_add(ctx, &test_event, blobmsg_get_u32(tb[WATCH_ID]));
+ fprintf(stderr, "Watching object %08x: %s\n", blobmsg_get_u32(tb[WATCH_ID]), ubus_strerror(ret));
+ return ret;
+}
+
static const struct ubus_method test_methods[] = {
- { .name = "hello", .handler = test_hello },
+ UBUS_METHOD("hello", test_hello, hello_policy),
+ UBUS_METHOD("watch", test_watch, watch_policy),
};
+static struct ubus_object_type test_object_type =
+ UBUS_OBJECT_TYPE("test", test_methods);
+
static struct ubus_object test_object = {
.name = "test",
.type = &test_object_type,
.n_methods = ARRAY_SIZE(test_methods),
};
-static struct ubus_object test_object2 = {
- .name = "test2",
+static struct ubus_object test_client_object = {
.type = &test_object_type,
.methods = test_methods,
.n_methods = ARRAY_SIZE(test_methods),
};
+static void server_main(void)
+{
+ int ret;
+
+ ret = ubus_add_object(ctx, &test_object);
+ if (ret)
+ fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
+
+ ret = ubus_register_watch_object(ctx, &test_event);
+ if (ret)
+ fprintf(stderr, "Failed to add watch handler: %s\n", ubus_strerror(ret));
+
+ uloop_run();
+}
+
+static void client_main(void)
+{
+ uint32_t id;
+ int ret;
+
+ ret = ubus_add_object(ctx, &test_client_object);
+ if (ret) {
+ fprintf(stderr, "Failed to add_object object: %s\n", ubus_strerror(ret));
+ return;
+ }
+
+ if (ubus_lookup_id(ctx, test_object.name, &id)) {
+ fprintf(stderr, "Failed to look up test object\n");
+ return;
+ }
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_u32(&b, "id", test_client_object.id);
+ ubus_invoke(ctx, id, "watch", b.head, NULL, 0, 3000);
+ uloop_run();
+}
+
int main(int argc, char **argv)
{
- const char *progname, *ubus_socket = NULL;
- int ret = 0;
+ const char *ubus_socket = NULL;
+ bool client = false;
int ch;
- progname = argv[0];
-
- while ((ch = getopt(argc, argv, "s:")) != -1) {
+ while ((ch = getopt(argc, argv, "cs:")) != -1) {
switch (ch) {
case 's':
ubus_socket = optarg;
break;
+ case 'c':
+ client = true;
+ break;
default:
break;
}
argc -= optind;
argv += optind;
+ uloop_init();
+
ctx = ubus_connect(ubus_socket);
if (!ctx) {
fprintf(stderr, "Failed to connect to ubus\n");
return -1;
}
- fprintf(stderr, "Connected as ID 0x%08x\n", ctx->local_id);
+ ubus_add_uloop(ctx);
- fprintf(stderr, "Publishing object\n");
- ret = ubus_add_object(ctx, &test_object);
- if (ret)
- fprintf(stderr, "Failed to add_object object: %s\n", ubus_strerror(ret));
- else {
- fprintf(stderr, "Object ID: %08x\n", test_object.id);
- fprintf(stderr, "Object Type ID: %08x\n", test_object.type->id);
- }
+ if (client)
+ client_main();
+ else
+ server_main();
- fprintf(stderr, "Publishing object\n");
- ret = ubus_add_object(ctx, &test_object2);
- if (ret)
- fprintf(stderr, "Failed to add_object object: %s\n", ubus_strerror(ret));
- else {
- fprintf(stderr, "Object ID: %08x\n", test_object2.id);
- fprintf(stderr, "Object Type ID: %08x\n", test_object2.type->id);
- }
- uloop_init();
- ubus_add_uloop(ctx);
- uloop_run();
+ ubus_free(ctx);
uloop_done();
- ubus_free(ctx);
return 0;
}
projects / project / ubus.git / blobdiff