X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=fa32465f953bb18a3577ef48282f70bc18050a12;hp=89bd015bb80d1748299453ac1a5e6d904906acb7;hb=c0c78c92d57c53276bb7f08468bcc716ba272497;hpb=cef25024bc6d3948d1e4a164d82a63fa21414912 diff --git a/cache.c b/cache.c index 89bd015..fa32465 100644 --- a/cache.c +++ b/cache.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,7 @@ #include "interface.h" static struct uloop_timeout cache_gc; -struct avl_tree entries; +struct avl_tree services; static AVL_TREE(records, avl_strcmp, true, NULL); static void @@ -54,17 +53,17 @@ cache_record_free(struct cache_record *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); + 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; @@ -74,17 +73,23 @@ 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)) + 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); @@ -93,7 +98,7 @@ cache_gc_timer(struct uloop_timeout *timeout) int cache_init(void) { - avl_init(&entries, avl_strcmp, true, NULL); + avl_init(&services, avl_strcmp, true, NULL); cache_gc.cb = cache_gc_timer; uloop_timeout_set(&cache_gc, 10000); @@ -101,48 +106,55 @@ cache_init(void) 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); + 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 interface *iface; - struct cache_entry *s; + struct cache_service *s; vlist_for_each_element(&interfaces, iface, node) - avl_for_each_element(&entries, s, avl) - dns_send_question(iface, s->entry, TYPE_PTR); + avl_for_each_element(&services, s, avl) + dns_send_question(iface, s->entry, TYPE_PTR, 0); } -static struct cache_entry* -cache_entry(struct interface *iface, 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->avl.key = s->entry = strcpy(entry_buf, entry); - s->time = time(NULL); + s->time = monotonic_time(); s->ttl = ttl; + s->iface = iface; + s->refresh = 50; if (hlen) s->host = strncpy(host_buf, s->entry, hlen); @@ -152,10 +164,10 @@ cache_entry(struct interface *iface, char *entry, int hlen, int ttl) type++; if (type) s->avl.key = type; - avl_insert(&entries, &s->avl); + avl_insert(&services, &s->avl); if (!hlen) - dns_send_question(iface, entry, TYPE_PTR); + dns_send_question(iface, entry, TYPE_PTR, iface->multicast); return s; } @@ -168,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); @@ -217,7 +229,7 @@ cache_host_is_known(char *record) } void -cache_answer(struct interface *iface, 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; @@ -226,11 +238,8 @@ 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[MAX_DATA_LEN + 1]; - - if (!(a->class & CLASS_IN)) - return; + static char *rdata_buffer = (char *) mdns_buf; + time_t now = monotonic_time(); nlen = strlen(name); @@ -244,7 +253,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc 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); @@ -252,14 +261,25 @@ 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_entry(iface, rdata_buffer, host_len, a->ttl); - return; + cache_service(iface, rdata_buffer, host_len, a->ttl); + + 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: @@ -276,20 +296,20 @@ 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; case TYPE_A: - cache_entry(iface, 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(iface, name, strlen(name), a->ttl); + cache_service(iface, name, strlen(name), a->ttl); if (a->rdlength != 16) return; dlen = 16; @@ -302,10 +322,11 @@ 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 = 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; @@ -324,7 +345,8 @@ 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 = time(NULL); + r->time = now; + r->iface = iface; if (tlen) r->txt = memcpy(txt_ptr, rdata_buffer, tlen); @@ -341,15 +363,12 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc void cache_dump_records(struct blob_buf *buf, const char *name) { - struct cache_record *r, *q = avl_find_element(&records, name, r, avl); + struct cache_record *r, *last, *next; const char *txt; char buffer[INET6_ADDRSTRLEN]; - if (!q) - return; - - do { - r = q; + 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)) { @@ -376,6 +395,85 @@ cache_dump_records(struct blob_buf *buf, const char *name) blobmsg_add_string(buf, "ipv6", buffer); break; } - q = avl_next_element(r, avl); - } while (q && !strcmp(r->record, q->record)); + + 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); + } + } }