X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=6240e2f2c8ee80a9fe7751853cd3ef61c6022d11;hp=4dcccfb8b20ff0050ea82840ef3e04830963f900;hb=c4c7a8db3384ca5d6f13737d90d75f1f2394dcc9;hpb=a2684fb549fa8bf2f3097ea73b158248a4606d42

diff --git a/cache.c b/cache.c
index 4dcccfb..6240e2f 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>
@@ -42,7 +41,8 @@
 #include "interface.h"
 
 static struct uloop_timeout cache_gc;
-struct avl_tree records, entries, hosts;
+struct avl_tree entries;
+static AVL_TREE(records, avl_strcmp, true, NULL);
 
 static void
 cache_record_free(struct cache_record *r)
@@ -93,7 +93,6 @@ int
 cache_init(void)
 {
 	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);
@@ -121,20 +120,20 @@ cache_scan(void)
 
 	vlist_for_each_element(&interfaces, iface, node)
 		avl_for_each_element(&entries, s, avl)
-			dns_send_question(iface, s->entry, TYPE_PTR);
+			dns_send_question(iface, s->entry, TYPE_PTR, 1);
 }
 
 static struct cache_entry*
 cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
 {
-	struct cache_entry *s;
+	struct cache_entry *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(&entries, s, avl, t)
+		if (!strcmp(s->entry, entry))
+			return s;
 
 	s = calloc_a(sizeof(*s),
 		&entry_buf, strlen(entry) + 1,
@@ -155,7 +154,7 @@ cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
 	avl_insert(&entries, &s->avl);
 
 	if (!hlen)
-		dns_send_question(iface, entry, TYPE_PTR);
+		dns_send_question(iface, entry, TYPE_PTR, !iface->multicast);
 
 	return s;
 }
@@ -168,7 +167,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);
@@ -226,6 +225,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	char *name_buf;
 	void *rdata_ptr, *txt_ptr;
 	int host_len = 0;
+	static char *rdata_buffer = (char *) mdns_buf;
 
 	if (!(a->class & CLASS_IN))
 		return;
@@ -274,7 +274,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 			uint8_t v = *p;
 
 			*p = '\0';
-			if (v)
+			if (v && p + v < &rdata_buffer[rdlength])
 				p += v + 1;
 		} while (*p);
 		break;
@@ -300,8 +300,8 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	r = cache_record_find(name, a->type, port, dlen, rdata);
 	if (r) {
 		if (!a->ttl) {
-			cache_record_free(r);
 			DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
+			r->time = time(0) + 1 - r->ttl;
 		} else {
 			r->ttl = a->ttl;
 			DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
@@ -335,3 +335,48 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	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;
+	}
+}