X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=adfc8159599048fae46cf12101b92242b42f2833;hp=403ddb8eb096100c37d9697ca54614d200ec3228;hb=4059fe10c18e7ea7309198741f18cf71c6afc911;hpb=f02862350ac609517e19da3916a17f5d6c81698b

diff --git a/cache.c b/cache.c
index 403ddb8..adfc815 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,9 +38,11 @@
 #include "cache.h"
 #include "util.h"
 #include "dns.h"
+#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)
@@ -92,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);
@@ -115,14 +115,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;
@@ -152,7 +154,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;
 }
@@ -214,7 +216,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;
@@ -223,6 +225,7 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	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;
@@ -247,7 +250,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:
@@ -277,14 +280,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;
@@ -332,3 +335,48 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
 	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;
+	}
+}