From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 5 Jun 2014 12:39:48 +0000 (+0200)
Subject: cache: remove service descriptions for now, they belong in the UI layer
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=commitdiff_plain;h=f02862350ac609517e19da3916a17f5d6c81698b

cache: remove service descriptions for now, they belong in the UI layer

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/cache.c b/cache.c
index be26fb6..403ddb8 100644
--- a/cache.c
+++ b/cache.c
@@ -42,9 +42,6 @@
 
 static struct uloop_timeout cache_gc;
 struct avl_tree records, entries, hosts;
-static struct blob_buf b;
-
-static struct kvlist types;
 
 static void
 cache_record_free(struct cache_record *r)
@@ -91,37 +88,14 @@ cache_gc_timer(struct uloop_timeout *timeout)
 	uloop_timeout_set(timeout, 10000);
 }
 
-static void
-cache_load_services(void)
-{
-	struct blob_attr *cur;
-	int rem;
-
-	blob_buf_init(&b, 0);
-
-	if (!blobmsg_add_json_from_file(&b, "/lib/mdns/service-types"))
-		return;
-
-	blob_for_each_attr(cur, b.head, rem)
-		kvlist_set(&types, blobmsg_name(cur), blobmsg_get_string(cur));
-}
-
-char*
-cache_lookup_name(const char *key)
-{
-	return kvlist_get(&types, key);
-}
-
 int
 cache_init(void)
 {
-	kvlist_init(&types, kvlist_strlen);
 	avl_init(&entries, avl_strcmp, true, NULL);
 	avl_init(&records, avl_strcmp, true, NULL);
 
 	cache_gc.cb = cache_gc_timer;
 	uloop_timeout_set(&cache_gc, 10000);
-	cache_load_services();
 
 	return 0;
 }
diff --git a/ubus.c b/ubus.c
index 67a4bab..232170a 100644
--- a/ubus.c
+++ b/ubus.c
@@ -107,10 +107,7 @@ 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);
 		local = strstr(buffer, "._");