X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubus.c;h=32e30876ed5c276ee4962e68679ef277b39316bf;hb=3e754941460f3756b935d66780f406271be929c1;hp=dd590afb804fe83a529709b3a4cb40b9c7a17712;hpb=28bf0f6d036eaa7ef3cf628f0663ba65b26db040;p=project%2Fmdnsd.git

diff --git a/ubus.c b/ubus.c
index dd590af..32e3087 100644
--- a/ubus.c
+++ b/ubus.c
@@ -17,11 +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;
@@ -31,6 +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(1);
 	return 0;
 }
 
@@ -43,63 +47,21 @@ mdns_scan(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
-static void
-mdns_add_records(const char *name)
-{
-	struct cache_record *r, *q = avl_find_element(&records, name, r, avl);
-	char *txt;
-	char buffer[MAX_NAME_LEN];
-
-	if (!q)
-		return;
-
-	do {
-		r = q;
-		switch (r->type) {
-		case TYPE_TXT:
-			if (r->txt && strlen(r->txt)) {
-				txt = r->txt;
-				do {
-					blobmsg_add_string(&b, "txt", txt);
-					txt = &txt[strlen(txt) + 1];
-				} while (*txt);
-			}
-			break;
-
-		case TYPE_SRV:
-			if (r->port)
-				blobmsg_add_u32(&b, "port", r->port);
-			break;
-
-		case TYPE_A:
-			if ((r->rdlength == 4) && inet_ntop(AF_INET, r->rdata, buffer, INET6_ADDRSTRLEN))
-				blobmsg_add_string(&b, "ipv4", buffer);
-			break;
-
-		case TYPE_AAAA:
-			if ((r->rdlength == 16) && inet_ntop(AF_INET6, r->rdata, buffer, INET6_ADDRSTRLEN))
-				blobmsg_add_string(&b, "ipv6", buffer);
-			break;
-		}
-		q = avl_next_element(r, avl);
-	} while (q && !strcmp(r->record, q->record));
-}
-
 static int
 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];
+	char *buffer = (char *) mdns_buf;
 	void *c1 = NULL, *c2;
 
-        blob_buf_init(&b, 0);
+	blob_buf_init(&b, 0);
 	avl_for_each_element(&entries, s, avl) {
 		char *local;
 		if (*((char *) s->avl.key) != '_')
 			continue;
-		snprintf(buffer, MAX_NAME_LEN, s->avl.key);
+		snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->avl.key);
 		local = strstr(buffer, ".local");
 		if (local)
 			*local = '\0';
@@ -107,19 +69,16 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 			continue;
 
 		if (!c1) {
-			char *type = cache_lookup_name(buffer);
 			c1 = blobmsg_open_table(&b, buffer);
-			if (type)
-				blobmsg_add_string(&b, ".desc", type);
 		}
-		snprintf(buffer, MAX_NAME_LEN, s->entry);
+		snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);
 		local = strstr(buffer, "._");
 		if (local)
 			*local = '\0';
 		c2 = blobmsg_open_table(&b, buffer);
 		strncat(buffer, ".local", MAX_NAME_LEN);
-		mdns_add_records(buffer);
-		mdns_add_records(s->entry);
+		cache_dump_records(&b, buffer);
+		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)) {
@@ -138,22 +97,22 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
 		struct blob_attr *msg)
 {
 	struct cache_entry *s;
-	char buffer[MAX_NAME_LEN];
+	char *buffer = (char *) mdns_buf;
 	void *c;
 
-        blob_buf_init(&b, 0);
+	blob_buf_init(&b, 0);
 	avl_for_each_element(&entries, s, avl) {
 		char *local;
 		if (*((char *) s->avl.key) == '_')
 			continue;
-		snprintf(buffer, MAX_NAME_LEN, s->entry);
+		snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);
 		local = strstr(buffer, "._");
 		if (local)
 			*local = '\0';
 		c = blobmsg_open_table(&b, buffer);
 		strncat(buffer, ".local", MAX_NAME_LEN);
-		mdns_add_records(buffer);
-		mdns_add_records(s->entry);
+		cache_dump_records(&b, buffer);
+		cache_dump_records(&b, s->entry);
 		blobmsg_close_table(&b, c);
 	}
 	ubus_send_reply(ctx, req, b.head);
@@ -161,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),
@@ -194,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);
+}