Fix IPv6 read

[project/mdnsd.git] / cache.c

diff --git a/cache.c b/cache.c
index e447922..07d4f20 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -61,9 +61,9 @@ cache_service_free(struct cache_service *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;
@@ -76,14 +76,20 @@ cache_gc_timer(struct uloop_timeout *timeout)
        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(&services, s, avl, t) {
                if (!s->host)
                        continue;
-               if (cache_is_expired(s->time, s->ttl))
+               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, 1);
        }
 
        uloop_timeout_set(timeout, 10000);
@@ -134,17 +140,21 @@ cache_service(struct interface *iface, char *entry, int hlen, int ttl)
        char *type;
 
        avl_for_each_element_safe(&services, s, avl, t)
-               if (!strcmp(s->entry, entry))
+               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);
@@ -229,6 +239,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);
 
@@ -251,13 +262,24 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
                        host_len = rdlength - nlen - 1;
 
                cache_service(iface, rdata_buffer, host_len, a->ttl);
-               return;
+
+               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:
@@ -301,9 +323,10 @@ 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 = time(0) + 1 - 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;
@@ -322,7 +345,7 @@ 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)
@@ -381,3 +404,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);
+               }
+       }
+}