X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=cache.c;h=c78a3b7a9b438118b369c68c3102fd62cad0b9ee;hp=be26fb6e1b4494d52f7d453bc01d27993fefde78;hb=aee2d5582e56582ed0dc3096b364630b2ecfd56a;hpb=6a432a41b9629b6e70a41308f6d9487acf6f4621 diff --git a/cache.c b/cache.c index be26fb6..c78a3b7 100644 --- a/cache.c +++ b/cache.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -39,12 +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; -static struct blob_buf b; - -static struct kvlist types; +struct avl_tree entries; +static AVL_TREE(records, avl_strcmp, true, NULL); static void cache_record_free(struct cache_record *r) @@ -91,37 +89,13 @@ cache_gc_timer(struct uloop_timeout *timeout) uloop_timeout_set(timeout, 10000); } -static void -cache_load_services(void) -{ - struct blob_attr *cur; - int rem; - - blob_buf_init(&b, 0); - - if (!blobmsg_add_json_from_file(&b, "/lib/mdns/service-types")) - return; - - blob_for_each_attr(cur, b.head, rem) - kvlist_set(&types, blobmsg_name(cur), blobmsg_get_string(cur)); -} - -char* -cache_lookup_name(const char *key) -{ - return kvlist_get(&types, key); -} - int cache_init(void) { - kvlist_init(&types, kvlist_strlen); 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); - cache_load_services(); return 0; } @@ -141,23 +115,25 @@ 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; + 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, @@ -178,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; } @@ -191,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); @@ -240,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; @@ -249,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; @@ -273,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: @@ -297,20 +274,20 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns 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(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; @@ -323,8 +300,8 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns 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); @@ -358,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; + } +}