X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=7d2aa8fdba2d467320c74cc4db53990dfc9db01c;hp=59d5b940a2e71d9ead48b32f84fedf366ca7b1c5;hb=HEAD;hpb=91c9d646401d07b77db7d81de5df9a1046185c55

diff --git a/cache.c b/cache.c
index 59d5b94..7d2aa8f 100644
--- a/cache.c
+++ b/cache.c
@@ -42,7 +42,7 @@
 
 static struct uloop_timeout cache_gc;
 struct avl_tree services;
-static AVL_TREE(records, avl_strcmp, true, NULL);
+AVL_TREE(records, avl_strcmp, true, NULL);
 
 static void
 cache_record_free(struct cache_record *r)
@@ -75,9 +75,22 @@ cache_gc_timer(struct uloop_timeout *timeout)
 	struct cache_record *r, *p;
 	struct cache_service *s, *t;
 
-	avl_for_each_element_safe(&records, r, avl, p)
-		if (cache_is_expired(r->time, r->ttl, 100))
+	avl_for_each_element_safe(&records, r, avl, p) {
+		if (!cache_is_expired(r->time, r->ttl, r->refresh))
+			continue;
+		/* Records other than A(AAA) are handled as services */
+		if (r->type != TYPE_A && r->type != TYPE_AAAA) {
+			if (cache_is_expired(r->time, r->ttl, 100))
+				cache_record_free(r);
+			continue;
+		}
+		if (r->refresh >= 100) {
 			cache_record_free(r);
+			continue;
+		}
+		r->refresh += 50;
+		dns_send_question(r->iface, (struct sockaddr *)&r->from, r->record, r->type, 0);
+	}
 
 	avl_for_each_element_safe(&services, s, avl, t) {
 		if (!s->host)
@@ -89,7 +102,7 @@ cache_gc_timer(struct uloop_timeout *timeout)
 			continue;
 		}
 		s->refresh += 50;
-		dns_send_question(s->iface, s->entry, TYPE_PTR, 1);
+		dns_send_question(s->iface, NULL, s->entry, TYPE_PTR, 0);
 	}
 
 	uloop_timeout_set(timeout, 10000);
@@ -121,14 +134,14 @@ void cache_cleanup(struct interface *iface)
 }
 
 void
-cache_scan(void)
+cache_update(void)
 {
 	struct interface *iface;
 	struct cache_service *s;
 
 	vlist_for_each_element(&interfaces, iface, node)
 		avl_for_each_element(&services, s, avl)
-			dns_send_question(iface, s->entry, TYPE_PTR, 1);
+			dns_send_question(iface, NULL, s->entry, TYPE_PTR, 0);
 }
 
 static struct cache_service*
@@ -143,6 +156,7 @@ cache_service(struct interface *iface, char *entry, int hlen, int ttl)
 		if (!strcmp(s->entry, entry)) {
 			s->refresh = 50;
 			s->time = monotonic_time();
+			s->ttl = ttl;
 			return s;
 		}
 
@@ -167,7 +181,7 @@ cache_service(struct interface *iface, char *entry, int hlen, int ttl)
 	avl_insert(&services, &s->avl);
 
 	if (!hlen)
-		dns_send_question(iface, entry, TYPE_PTR, !iface->multicast);
+		dns_send_question(iface, NULL, entry, TYPE_PTR, iface->multicast);
 
 	return s;
 }
@@ -228,8 +242,9 @@ cache_host_is_known(char *record)
 	return 0;
 }
 
-void
-cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata, int flush)
+void cache_answer(struct interface *iface, struct sockaddr *from, 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;
@@ -239,6 +254,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	void *rdata_ptr, *txt_ptr;
 	int host_len = 0;
 	static char *rdata_buffer = (char *) mdns_buf;
+	time_t now = monotonic_time();
 
 	nlen = strlen(name);
 
@@ -260,7 +276,8 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 		    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
 			host_len = rdlength - nlen - 1;
 
-		cache_service(iface, rdata_buffer, host_len, a->ttl);
+		if (name[0] == '_')
+			cache_service(iface, rdata_buffer, host_len, a->ttl);
 
 		dlen = strlen(rdata_buffer) + 1;
 		rdata = (uint8_t*)rdata_buffer;
@@ -301,14 +318,12 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 		break;
 
 	case TYPE_A:
-		cache_service(iface, name, strlen(name), a->ttl);
 		if (a->rdlength != 4)
 			return;
 		dlen = 4;
 		break;
 
 	case TYPE_AAAA:
-		cache_service(iface, name, strlen(name), a->ttl);
 		if (a->rdlength != 16)
 			return;
 		dlen = 16;
@@ -322,9 +337,12 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	if (r) {
 		if (!a->ttl) {
 			DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
-			r->time = monotonic_time() + 1 - r->ttl;
+			r->time = now + 1 - r->ttl;
+			r->refresh = 100;
 		} else {
 			r->ttl = a->ttl;
+			r->time = now;
+			r->refresh = 50;
 			DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
 		}
 		return;
@@ -343,8 +361,13 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	r->ttl = a->ttl;
 	r->port = port;
 	r->rdlength = dlen;
-	r->time = monotonic_time();
+	r->time = now;
 	r->iface = iface;
+	if (iface->v6)
+		memcpy(&r->from, from, sizeof(struct sockaddr_in6));
+	else
+		memcpy(&r->from, from, sizeof(struct sockaddr_in));
+	r->refresh = 50;
 
 	if (tlen)
 		r->txt = memcpy(txt_ptr, rdata_buffer, tlen);
@@ -402,3 +425,76 @@ cache_dump_records(struct blob_buf *buf, const char *name)
 			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);
+		}
+	}
+}