X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=9addc3c75b008ab9429b7b7097a0de791a67c29a;hp=be26fb6e1b4494d52f7d453bc01d27993fefde78;hb=571cc214415f40ea52a98eed6b450b74be69c6f9;hpb=6a432a41b9629b6e70a41308f6d9487acf6f4621

diff --git a/cache.c b/cache.c
index be26fb6..9addc3c 100644
--- a/cache.c
+++ b/cache.c
@@ -39,12 +39,10 @@
 #include "cache.h"
 #include "util.h"
 #include "dns.h"
+#include "interface.h"
 
 static struct uloop_timeout cache_gc;
-struct avl_tree records, entries, hosts;
-static struct blob_buf b;
-
-static struct kvlist types;
+struct avl_tree records, entries;
 
 static void
 cache_record_free(struct cache_record *r)
@@ -91,37 +89,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;
 }
@@ -141,14 +116,16 @@ void cache_cleanup(void)
 void
 cache_scan(void)
 {
+	struct interface *iface;
 	struct cache_entry *s;
 
-	avl_for_each_element(&entries, s, avl)
-		dns_send_question(&listener, s->entry, TYPE_PTR);
+	vlist_for_each_element(&interfaces, iface, node)
+		avl_for_each_element(&entries, s, avl)
+			dns_send_question(iface, s->entry, TYPE_PTR);
 }
 
 static struct cache_entry*
-cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
+cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
 {
 	struct cache_entry *s;
 	char *entry_buf;
@@ -178,7 +155,7 @@ cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
 	avl_insert(&entries, &s->avl);
 
 	if (!hlen)
-		dns_send_question(u, entry, TYPE_PTR);
+		dns_send_question(iface, entry, TYPE_PTR);
 
 	return s;
 }
@@ -240,7 +217,7 @@ cache_host_is_known(char *record)
 }
 
 void
-cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata)
+cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata)
 {
 	struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
 	struct cache_record *r;
@@ -250,6 +227,8 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	void *rdata_ptr, *txt_ptr;
 	int host_len = 0;
 
+	static char rdata_buffer[MAX_DATA_LEN + 1];
+
 	if (!(a->class & CLASS_IN))
 		return;
 
@@ -273,7 +252,7 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 		    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
 			host_len = rdlength - nlen - 1;
 
-		cache_entry(u, rdata_buffer, host_len, a->ttl);
+		cache_entry(iface, rdata_buffer, host_len, a->ttl);
 		return;
 
 	case TYPE_SRV:
@@ -303,14 +282,14 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 		break;
 
 	case TYPE_A:
-		cache_entry(u, name, strlen(name), a->ttl);
+		cache_entry(iface, name, strlen(name), a->ttl);
 		if (a->rdlength != 4)
 			return;
 		dlen = 4;
 		break;
 
 	case TYPE_AAAA:
-		cache_entry(u, name, strlen(name), a->ttl);
+		cache_entry(iface, name, strlen(name), a->ttl);
 		if (a->rdlength != 16)
 			return;
 		dlen = 16;