X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=fa32465f953bb18a3577ef48282f70bc18050a12;hp=da65b1f4b4d327b2eaa8608a460864b01ddf40ce;hb=c0c78c92d57c53276bb7f08468bcc716ba272497;hpb=d76c21865eed783deb18a34a4f497f3da50320c9

diff --git a/cache.c b/cache.c
index da65b1f..fa32465 100644
--- a/cache.c
+++ b/cache.c
@@ -24,7 +24,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <asm/byteorder.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <time.h>
@@ -39,44 +38,32 @@
 #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 services;
+static AVL_TREE(records, avl_strcmp, true, NULL);
 
 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);
-	if (r->record)
-		free(r->record);
-	if (r->rdata)
-		free(r->rdata);
-	if (r->txt)
-		free(r->txt);
+	avl_delete(&records, &r->avl);
 	free(r);
 }
 
 static void
-cache_entry_free(struct cache_entry *s)
+cache_service_free(struct cache_service *s)
 {
 	DBG(2, "%s\n", s->entry);
-	avl_delete(&entries, &s->avl);
-	if (s->host)
-		free(s->host);
-	if (s->entry)
-		free(s->entry);
+	avl_delete(&services, &s->avl);
 	free(s);
 }
 
 static int
-cache_is_expired(time_t t, uint32_t ttl)
+cache_is_expired(time_t t, uint32_t ttl, int frac)
 {
-	if (time(NULL) - t >= ttl)
+	if (monotonic_time() - t >= ttl * frac / 100)
 		return 1;
 
 	return 0;
@@ -86,105 +73,101 @@ static void
 cache_gc_timer(struct uloop_timeout *timeout)
 {
 	struct cache_record *r, *p;
-	struct cache_entry *s, *t;
+	struct cache_service *s, *t;
 
 	avl_for_each_element_safe(&records, r, avl, p)
-		if (cache_is_expired(r->time, r->ttl))
-			cache_record_free(r, 1);
+		if (cache_is_expired(r->time, r->ttl, 100))
+			cache_record_free(r);
 
-	avl_for_each_element_safe(&entries, s, avl, t) {
+	avl_for_each_element_safe(&services, s, avl, t) {
 		if (!s->host)
 			continue;
-		if (cache_is_expired(s->time, s->ttl))
-			cache_entry_free(s);
+		if (!cache_is_expired(s->time, s->ttl, s->refresh))
+			continue;
+		if (s->refresh >= 100) {
+			cache_service_free(s);
+			continue;
+		}
+		s->refresh += 50;
+		dns_send_question(s->iface, s->entry, TYPE_PTR, 0);
 	}
 
 	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);
+	avl_init(&services, avl_strcmp, true, NULL);
 
 	cache_gc.cb = cache_gc_timer;
 	uloop_timeout_set(&cache_gc, 10000);
-	cache_load_services();
 
 	return 0;
 }
 
-void cache_cleanup(void)
+void cache_cleanup(struct interface *iface)
 {
 	struct cache_record *r, *p;
-	struct cache_entry *s, *t;
+	struct cache_service *s, *t;
 
-	avl_for_each_element_safe(&records, r, avl, p)
-		cache_record_free(r, 1);
+	avl_for_each_element_safe(&services, s, avl, t)
+		if (!iface || iface == s->iface)
+			cache_service_free(s);
 
-	avl_for_each_element_safe(&entries, s, avl, t)
-		cache_entry_free(s);
+	avl_for_each_element_safe(&records, r, avl, p)
+		if (!iface || iface == r->iface)
+			cache_record_free(r);
 }
 
 void
 cache_scan(void)
 {
-	struct cache_entry *s;
+	struct interface *iface;
+	struct cache_service *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(&services, s, avl)
+			dns_send_question(iface, s->entry, TYPE_PTR, 0);
 }
 
-static struct cache_entry*
-cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
+static struct cache_service*
+cache_service(struct interface *iface, char *entry, int hlen, int ttl)
 {
-	struct cache_entry *s;
+	struct cache_service *s, *t;
+	char *entry_buf;
+	char *host_buf;
 	char *type;
 
-	s = avl_find_element(&entries, entry, s, avl);
-	if (s)
-		return s;
+	avl_for_each_element_safe(&services, s, avl, t)
+		if (!strcmp(s->entry, entry)) {
+			s->refresh = 50;
+			s->time = monotonic_time();
+			return s;
+		}
+
+	s = calloc_a(sizeof(*s),
+		&entry_buf, strlen(entry) + 1,
+		&host_buf, hlen ? hlen + 1 : 0);
 
-	s = malloc(sizeof(struct cache_entry));
-	memset(s, 0, sizeof(struct cache_entry));
-	s->avl.key = s->entry = strdup(entry);
-	s->time = time(NULL);
+	s->avl.key = s->entry = strcpy(entry_buf, entry);
+	s->time = monotonic_time();
 	s->ttl = ttl;
+	s->iface = iface;
+	s->refresh = 50;
 
 	if (hlen)
-		s->host = strndup(s->entry, hlen);
-	type = strstr(s->entry, "._");
+		s->host = strncpy(host_buf, s->entry, hlen);
+
+	type = strstr(entry_buf, "._");
 	if (type)
 		type++;
 	if (type)
 		s->avl.key = type;
-	avl_insert(&entries, &s->avl);
+	avl_insert(&services, &s->avl);
 
 	if (!hlen)
-		dns_send_question(u, entry, TYPE_PTR);
+		dns_send_question(iface, entry, TYPE_PTR, iface->multicast);
 
 	return s;
 }
@@ -197,7 +180,7 @@ cache_record_find(char *record, int type, int port, int rdlength, uint8_t *rdata
 	if (!l)
 		return NULL;
 
-	while (l && !avl_is_last(&records, &l->avl) && !strcmp(l->record, record)) {
+	while (l && l->record && !strcmp(l->record, record)) {
 		struct cache_record *r = l;
 
 		l = avl_next_element(l, avl);
@@ -246,15 +229,17 @@ 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, int flush)
 {
 	struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
 	struct cache_record *r;
 	int port = 0, dlen = 0, tlen = 0, nlen, rdlength;
 	char *p = NULL;
-
-	if (!(a->class & CLASS_IN))
-		return;
+	char *name_buf;
+	void *rdata_ptr, *txt_ptr;
+	int host_len = 0;
+	static char *rdata_buffer = (char *) mdns_buf;
+	time_t now = monotonic_time();
 
 	nlen = strlen(name);
 
@@ -268,26 +253,33 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 			return;
 		}
 
-		DBG(1, "A -> %s %s %s\n", dns_type_string(a->type), name, rdata_buffer);
+		DBG(1, "A -> %s %s %s ttl:%d\n", dns_type_string(a->type), name, rdata_buffer, a->ttl);
 
 		rdlength = strlen(rdata_buffer);
 
-		if (!strcmp(C_DNS_SD, name)) {
-			cache_entry(u, rdata_buffer, 0, a->ttl);
-			return;
-		}
+		if (strcmp(C_DNS_SD, name) != 0 &&
+		    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
+			host_len = rdlength - nlen - 1;
 
-		if ((rdlength < nlen) && (rdlength - nlen - 1 > 0))
-			return;
+		cache_service(iface, rdata_buffer, host_len, a->ttl);
 
-		cache_entry(u, rdata_buffer, rdlength - nlen - 1, a->ttl);
-		return;
+		dlen = strlen(rdata_buffer) + 1;
+		rdata = (uint8_t*)rdata_buffer;
+		break;
 
 	case TYPE_SRV:
 		if (a->rdlength < 8)
 			return;
 
 		port = be16_to_cpu(dsd->port);
+		memcpy(rdata_buffer, dsd, sizeof(*dsd));
+		if (dn_expand(base, base + blen, (const uint8_t*)&dsd[1],
+				&rdata_buffer[sizeof(*dsd)], MAX_DATA_LEN - sizeof(*dsd)) < 0) {
+			perror("process_answer/dn_expand");
+			return;
+		}
+		dlen = sizeof(*dsd) + strlen(&rdata_buffer[sizeof(*dsd)]) + 1;
+		rdata = (uint8_t*)rdata_buffer;
 		break;
 
 	case TYPE_TXT:
@@ -304,20 +296,20 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 			uint8_t v = *p;
 
 			*p = '\0';
-			if (v)
+			if (v && p + v < &rdata_buffer[rdlength])
 				p += v + 1;
 		} while (*p);
 		break;
 
 	case TYPE_A:
-		cache_entry(u, name, strlen(name), a->ttl);
+		cache_service(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_service(iface, name, strlen(name), a->ttl);
 		if (a->rdlength != 16)
 			return;
 		dlen = 16;
@@ -330,10 +322,11 @@ 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);
 			DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
+			r->time = now + 1 - r->ttl;
 		} else {
 			r->ttl = a->ttl;
+			r->time = now;
 			DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
 		}
 		return;
@@ -342,32 +335,145 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	if (!a->ttl)
 		return;
 
-	r = malloc(sizeof(struct cache_record));
-	memset(r, 0, sizeof(struct cache_record));
-	r->avl.key = r->record = strdup(name);
+	r = calloc_a(sizeof(*r),
+		&name_buf, strlen(name) + 1,
+		&txt_ptr, tlen,
+		&rdata_ptr, dlen);
+
+	r->avl.key = r->record = strcpy(name_buf, name);
 	r->type = a->type;
 	r->ttl = a->ttl;
 	r->port = port;
 	r->rdlength = dlen;
-	r->time = time(NULL);
+	r->time = now;
+	r->iface = iface;
 
-	if (tlen) {
-		r->txt = malloc(tlen);
-		if (r->txt)
-			memcpy(r->txt, rdata_buffer, tlen);
-	}
+	if (tlen)
+		r->txt = memcpy(txt_ptr, rdata_buffer, tlen);
 
-	if (dlen) {
-		r->rdata = malloc(dlen);
-		if (!r->rdata) {
-			cache_record_free(r, 0);
-			return;
-		}
-		memcpy(r->rdata, rdata, dlen);
-	}
+	if (dlen)
+		r->rdata = memcpy(rdata_ptr, rdata, dlen);
 
 	if (avl_insert(&records, &r->avl))
-		cache_record_free(r, 0);
+		free(r);
 	else
 		DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
 }
+
+void
+cache_dump_records(struct blob_buf *buf, const char *name)
+{
+	struct cache_record *r, *last, *next;
+	const char *txt;
+	char buffer[INET6_ADDRSTRLEN];
+
+	last = avl_last_element(&records, last, avl);
+	for (r = avl_find_element(&records, name, r, avl); r; r = next) {
+		switch (r->type) {
+		case TYPE_TXT:
+			if (r->txt && strlen(r->txt)) {
+				txt = r->txt;
+				do {
+					blobmsg_add_string(buf, "txt", txt);
+					txt = &txt[strlen(txt) + 1];
+				} while (*txt);
+			}
+			break;
+
+		case TYPE_SRV:
+			if (r->port)
+				blobmsg_add_u32(buf, "port", r->port);
+			break;
+
+		case TYPE_A:
+			if ((r->rdlength == 4) && inet_ntop(AF_INET, r->rdata, buffer, INET6_ADDRSTRLEN))
+				blobmsg_add_string(buf, "ipv4", buffer);
+			break;
+
+		case TYPE_AAAA:
+			if ((r->rdlength == 16) && inet_ntop(AF_INET6, r->rdata, buffer, INET6_ADDRSTRLEN))
+				blobmsg_add_string(buf, "ipv6", buffer);
+			break;
+		}
+
+		if (r == last)
+			break;
+
+		next = avl_next_element(r, avl);
+		if (strcmp(r->record, next->record) != 0)
+			break;
+	}
+}
+
+void
+cache_dump_recursive(struct blob_buf *b, const char *name, uint16_t type, struct interface *iface)
+{
+	time_t now = monotonic_time();
+	for (struct cache_record *r = avl_find_ge_element(&records, name, r, avl);
+			r && !strcmp(r->record, name);
+			r = !avl_is_last(&records, &r->avl) ? avl_next_element(r, avl) : NULL) {
+		int32_t ttl = r->ttl - (now - r->time);
+		if (ttl <= 0 || (iface && iface->ifindex != r->iface->ifindex) ||
+				(type != TYPE_ANY && type != r->type))
+			continue;
+
+		const char *txt;
+		char buf[INET6_ADDRSTRLEN];
+		void *k = blobmsg_open_table(b, NULL), *l;
+		const struct dns_srv_data *dsd = (const struct dns_srv_data*)r->rdata;
+
+		blobmsg_add_string(b, "name", r->record);
+		blobmsg_add_string(b, "type", dns_type_string(r->type));
+		blobmsg_add_u32(b, "ttl", ttl);
+
+		switch (r->type) {
+		case TYPE_TXT:
+			if ((txt = r->txt) && strlen(txt)) {
+				l = blobmsg_open_array(b, "data");
+				do {
+					blobmsg_add_string(b, NULL, txt);
+					txt = &txt[strlen(txt) + 1];
+				} while (*txt);
+				blobmsg_close_array(b, l);
+			}
+			break;
+
+		case TYPE_SRV:
+			if (r->rdlength > sizeof(*dsd)) {
+				blobmsg_add_u32(b, "priority", be16_to_cpu(dsd->priority));
+				blobmsg_add_u32(b, "weight", be16_to_cpu(dsd->weight));
+				blobmsg_add_u32(b, "port", be16_to_cpu(dsd->port));
+				blobmsg_add_string(b, "target", (const char*)&dsd[1]);
+			}
+			break;
+
+		case TYPE_PTR:
+			if (r->rdlength > 0)
+				blobmsg_add_string(b, "target", (const char*)r->rdata);
+			break;
+
+		case TYPE_A:
+			if ((r->rdlength == 4) && inet_ntop(AF_INET, r->rdata, buf, sizeof(buf)))
+				blobmsg_add_string(b, "target", buf);
+			break;
+
+		case TYPE_AAAA:
+			if ((r->rdlength == 16) && inet_ntop(AF_INET6, r->rdata, buf, sizeof(buf)))
+				blobmsg_add_string(b, "target", buf);
+			break;
+		}
+
+		blobmsg_close_table(b, k);
+
+
+		if (r->type == TYPE_PTR) {
+			cache_dump_recursive(b, (const char*)r->rdata, TYPE_SRV, iface);
+			cache_dump_recursive(b, (const char*)r->rdata, TYPE_TXT, iface);
+		}
+
+		if (r->type == TYPE_SRV) {
+			cache_dump_recursive(b, (const char*)&dsd[1], TYPE_A, iface);
+			cache_dump_recursive(b, (const char*)&dsd[1], TYPE_AAAA, iface);
+		}
+	}
+}