X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=cache.c;h=6ff2479a033cd06c4f9542efc5a6961ce7a93e60;hb=e1bacef27d869234149951cc7f4c9d3e0d8f07ad;hp=fa32465f953bb18a3577ef48282f70bc18050a12;hpb=9bbaf3c1f7826a7ac637ac0e2e7c8d5b43bac89d;p=project%2Fmdnsd.git

diff --git a/cache.c b/cache.c
index fa32465..6ff2479 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,21 @@ 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) {
+			cache_record_free(r);
+			continue;
+		}
+		if (r->refresh >= 100) {
 			cache_record_free(r);
+			continue;
+		}
+		r->refresh += 50;
+		dns_send_question(r->iface, r->record, r->type, 0);
+	}
 
 	avl_for_each_element_safe(&services, s, avl, t) {
 		if (!s->host)
@@ -121,7 +133,7 @@ void cache_cleanup(struct interface *iface)
 }
 
 void
-cache_scan(void)
+cache_update(void)
 {
 	struct interface *iface;
 	struct cache_service *s;
@@ -143,6 +155,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;
 		}
 
@@ -261,7 +274,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;
@@ -302,14 +316,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;
@@ -324,9 +336,11 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 		if (!a->ttl) {
 			DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, 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;
@@ -347,6 +361,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 	r->rdlength = dlen;
 	r->time = now;
 	r->iface = iface;
+	r->refresh = 50;
 
 	if (tlen)
 		r->txt = memcpy(txt_ptr, rdata_buffer, tlen);