X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubus-example.c;h=53d275b60d247faa85af7fc90804364f4ca48ec2;hp=298a7dd1386db620990a3b262d369c2c9193e9fd;hb=df69022bebe444a0c2ec2c9316748dc1dd833b4e;hpb=7a56ab0411fefef9ec0388818058638f02c6536b diff --git a/ubus-example.c b/ubus-example.c index 298a7dd..53d275b 100644 --- a/ubus-example.c +++ b/ubus-example.c @@ -1,27 +1,28 @@ +/* + * Copyright (C) 2011 Felix Fietkau + * + * 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 #include "libubus.h" static struct ubus_context *ctx; +static struct ubus_watch_object test_event; 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); - enum { HELLO_ID, HELLO_MSG, - HELLO_LAST + __HELLO_MAX }; static const struct blobmsg_policy hello_policy[] = { @@ -33,7 +34,7 @@ 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]; + struct blob_attr *tb[__HELLO_MAX]; char *msgstr = "(unknown)"; char *strbuf; @@ -44,16 +45,52 @@ static int test_hello(struct ubus_context *ctx, struct ubus_object *obj, 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); + sprintf(strbuf, "%s received a message: %s", obj->name, msgstr); blobmsg_add_string_buffer(&b); ubus_send_reply(ctx, req, b.head); 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, @@ -61,26 +98,63 @@ static struct ubus_object test_object = { .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; } @@ -89,36 +163,23 @@ int main(int argc, char **argv) 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_publish(ctx, &test_object); - if (ret) - fprintf(stderr, "Failed to publish 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_publish(ctx, &test_object2); - if (ret) - fprintf(stderr, "Failed to publish 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; }