X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=examples%2Fserver.c;h=c5af1aa32f346cdf0e24d279cdf18a31c8fcf986;hp=97789d5b6b203321248cf7e859e1fc04376466e0;hb=54c78ed9058375e5e548d06499b7a27c5deae81f;hpb=fc913a077d84ab0d23414a7124c7a127cb526122

diff --git a/examples/server.c b/examples/server.c
index 97789d5..c5af1aa 100644
--- a/examples/server.c
+++ b/examples/server.c
@@ -13,10 +13,11 @@
 
 #include <unistd.h>
 
+#include <libubox/blobmsg_json.h>
 #include "libubus.h"
 
 static struct ubus_context *ctx;
-static struct ubus_watch_object test_event;
+static struct ubus_subscriber test_event;
 static struct blob_buf b;
 
 enum {
@@ -72,19 +73,36 @@ static int test_hello(struct ubus_context *ctx, struct ubus_object *obj,
 
 enum {
 	WATCH_ID,
+	WATCH_COUNTER,
 	__WATCH_MAX
 };
 
 static const struct blobmsg_policy watch_policy[__WATCH_MAX] = {
 	[WATCH_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
+	[WATCH_COUNTER] = { .name = "counter", .type = BLOBMSG_TYPE_INT32 },
 };
 
-static void test_handle_event(struct ubus_context *ctx, struct ubus_watch_object *w,
-                       uint32_t id)
+static void
+test_handle_remove(struct ubus_context *ctx, struct ubus_subscriber *s,
+                   uint32_t id)
 {
 	fprintf(stderr, "Object %08x went away\n", id);
 }
 
+static int
+test_notify(struct ubus_context *ctx, struct ubus_object *obj,
+	    struct ubus_request_data *req, const char *method,
+	    struct blob_attr *msg)
+{
+	char *str;
+
+	str = blobmsg_format_json(msg, true);
+	fprintf(stderr, "Received notification '%s': %s\n", method, str);
+	free(str);
+
+	return 0;
+}
+
 static int test_watch(struct ubus_context *ctx, struct ubus_object *obj,
 		      struct ubus_request_data *req, const char *method,
 		      struct blob_attr *msg)
@@ -96,8 +114,9 @@ static int test_watch(struct ubus_context *ctx, struct ubus_object *obj,
 	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]));
+	test_event.remove_cb = test_handle_remove;
+	test_event.cb = test_notify;
+	ret = ubus_subscribe(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;
 }
@@ -125,7 +144,7 @@ static void server_main(void)
 	if (ret)
 		fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
 
-	ret = ubus_register_watch_object(ctx, &test_event);
+	ret = ubus_register_subscriber(ctx, &test_event);
 	if (ret)
 		fprintf(stderr, "Failed to add watch handler: %s\n", ubus_strerror(ret));