X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=123925afde4c80831600425004f258066807d483;hp=fcc1620f134d59ebc5a667ce8c3a3d36c3c48df3;hb=431db651f04d18d2ee454e49d14806f08283f28c;hpb=6d9da0c672b8df34435c4834d6aec4cc9a10792e

diff --git a/cache.c b/cache.c
index fcc1620..123925a 100644
--- a/cache.c
+++ b/cache.c
@@ -39,19 +39,16 @@
 #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;
 
 static void
-cache_record_free(struct cache_record *r, int rem)
+cache_record_free(struct cache_record *r)
 {
 	DBG(2, "%s %s\n", dns_type_string(r->type), r->record);
-	if (rem)
-		avl_delete(&records, &r->avl);
+	avl_delete(&records, &r->avl);
 	free(r);
 }
 
@@ -80,7 +77,7 @@ cache_gc_timer(struct uloop_timeout *timeout)
 
 	avl_for_each_element_safe(&records, r, avl, p)
 		if (cache_is_expired(r->time, r->ttl))
-			cache_record_free(r, 1);
+			cache_record_free(r);
 
 	avl_for_each_element_safe(&entries, s, avl, t) {
 		if (!s->host)
@@ -92,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;
 }
@@ -133,7 +107,7 @@ void cache_cleanup(void)
 	struct cache_entry *s, *t;
 
 	avl_for_each_element_safe(&records, r, avl, p)
-		cache_record_free(r, 1);
+		cache_record_free(r);
 
 	avl_for_each_element_safe(&entries, s, avl, t)
 		cache_entry_free(s);
@@ -145,11 +119,11 @@ cache_scan(void)
 	struct cache_entry *s;
 
 	avl_for_each_element(&entries, s, avl)
-		dns_send_question(&listener, s->entry, TYPE_PTR);
+		dns_send_question(cur_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;
@@ -179,7 +153,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;
 }
@@ -241,7 +215,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;
@@ -249,6 +223,7 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	char *p = NULL;
 	char *name_buf;
 	void *rdata_ptr, *txt_ptr;
+	int host_len = 0;
 
 	if (!(a->class & CLASS_IN))
 		return;
@@ -269,15 +244,11 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 
 		rdlength = strlen(rdata_buffer);
 
-		if (!strcmp(C_DNS_SD, name)) {
-			cache_entry(u, rdata_buffer, 0, a->ttl);
-			return;
-		}
-
-		if ((rdlength < nlen) && (rdlength - nlen - 1 > 0))
-			return;
+		if (strcmp(C_DNS_SD, name) != 0 &&
+		    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
+			host_len = rdlength - nlen - 1;
 
-		cache_entry(u, rdata_buffer, rdlength - nlen - 1, a->ttl);
+		cache_entry(iface, rdata_buffer, host_len, a->ttl);
 		return;
 
 	case TYPE_SRV:
@@ -307,14 +278,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;
@@ -327,7 +298,7 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	r = cache_record_find(name, a->type, port, dlen, rdata);
 	if (r) {
 		if (!a->ttl) {
-			cache_record_free(r, 1);
+			cache_record_free(r);
 			DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
 		} else {
 			r->ttl = a->ttl;