X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=ubus.c;h=67c3af73cc1a8c276ad12af94ae96aa29c827860;hp=efd6cb106e19ea086fa834d4e4f95741fec61ac6;hb=60ca4afc613db69b900a1b8283d12c2e831db200;hpb=c1c1ab720ed4ffa1e84cc4d201eef260c6cbbb96

diff --git a/ubus.c b/ubus.c
index efd6cb1..67c3af7 100644
--- a/ubus.c
+++ b/ubus.c
@@ -17,12 +17,14 @@
 #include <stdio.h>
 
 #include <libubus.h>
-#include <libubox/avl.h>
+#include <libubox/vlist.h>
 #include <libubox/uloop.h>
 
+#include "util.h"
 #include "ubus.h"
 #include "cache.h"
 #include "service.h"
+#include "interface.h"
 
 static struct ubus_auto_conn conn;
 static struct blob_buf b;
@@ -32,7 +34,7 @@ mdns_reload(struct ubus_context *ctx, struct ubus_object *obj,
 		struct ubus_request_data *req, const char *method,
 		struct blob_attr *msg)
 {
-	service_init();
+	service_init(1);
 	return 0;
 }
 
@@ -50,12 +52,12 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 		struct ubus_request_data *req, const char *method,
 		struct blob_attr *msg)
 {
-	struct cache_entry *s, *q;
-	char buffer[MAX_NAME_LEN];
+	struct cache_service *s, *q;
+	char *buffer = (char *) mdns_buf;
 	void *c1 = NULL, *c2;
 
-        blob_buf_init(&b, 0);
-	avl_for_each_element(&entries, s, avl) {
+	blob_buf_init(&b, 0);
+	avl_for_each_element(&services, s, avl) {
 		char *local;
 		if (*((char *) s->avl.key) != '_')
 			continue;
@@ -79,7 +81,7 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 		cache_dump_records(&b, s->entry);
 		blobmsg_close_table(&b, c2);
 		q = avl_next_element(s, avl);
-		if (!q || avl_is_last(&entries, &s->avl) || strcmp(s->avl.key, q->avl.key)) {
+		if (!q || avl_is_last(&services, &s->avl) || strcmp(s->avl.key, q->avl.key)) {
 			blobmsg_close_table(&b, c1);
 			c1 = NULL;
 		}
@@ -94,12 +96,12 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
 		struct ubus_request_data *req, const char *method,
 		struct blob_attr *msg)
 {
-	struct cache_entry *s;
-	char buffer[MAX_NAME_LEN];
+	struct cache_service *s;
+	char *buffer = (char *) mdns_buf;
 	void *c;
 
-        blob_buf_init(&b, 0);
-	avl_for_each_element(&entries, s, avl) {
+	blob_buf_init(&b, 0);
+	avl_for_each_element(&services, s, avl) {
 		char *local;
 		if (*((char *) s->avl.key) == '_')
 			continue;
@@ -118,7 +120,36 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
 	return UBUS_STATUS_OK;
 }
 
+static const struct blobmsg_policy config_policy[] = {
+	{ "interfaces", BLOBMSG_TYPE_ARRAY },
+};
+
+static int
+mdns_set_config(struct ubus_context *ctx, struct ubus_object *obj,
+		    struct ubus_request_data *req, const char *method,
+		    struct blob_attr *msg)
+{
+	struct blob_attr *data, *cur;
+	int rem;
+
+	blobmsg_parse(config_policy, 1, &data, blob_data(msg), blob_len(msg));
+	if (!data)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	if (!blobmsg_check_attr_list(data, BLOBMSG_TYPE_STRING))
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	vlist_update(&interfaces);
+	blobmsg_for_each_attr(cur, data, rem)
+		interface_add(blobmsg_data(cur));
+	vlist_flush(&interfaces);
+
+	return 0;
+}
+
+
 static const struct ubus_method mdns_methods[] = {
+	UBUS_METHOD("set_config", mdns_set_config, config_policy),
 	UBUS_METHOD_NOARG("scan", mdns_scan),
 	UBUS_METHOD_NOARG("browse", mdns_browse),
 	UBUS_METHOD_NOARG("hosts", mdns_hosts),
@@ -151,3 +182,16 @@ ubus_startup(void)
 	conn.cb = ubus_connect_handler;
 	ubus_auto_connect(&conn);
 }
+
+int ubus_service_list(ubus_data_handler_t cb)
+{
+	uint32_t id;
+	int ret;
+
+	blob_buf_init(&b, 0);
+	ret = ubus_lookup_id(&conn.ctx, "service", &id);
+	if (ret)
+		return ret;
+
+	return ubus_invoke(&conn.ctx, id, "list", b.head, cb, NULL, 5 * 1000);
+}