fix entry duplication bug

[project/mdnsd.git] / cache.c

diff --git a/cache.c b/cache.c
index 4dcccfb..e775537 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -24,7 +24,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <asm/byteorder.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <time.h>
@@ -42,7 +41,8 @@
 #include "interface.h"
 
 static struct uloop_timeout cache_gc;
-struct avl_tree records, entries, hosts;
+struct avl_tree entries;
+static AVL_TREE(records, avl_strcmp, true, NULL);
 
 static void
 cache_record_free(struct cache_record *r)
@@ -93,7 +93,6 @@ int
 cache_init(void)
 {
        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);
@@ -127,14 +126,14 @@ cache_scan(void)
 static struct cache_entry*
 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,
@@ -168,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 && !strcmp(l->record, record)) {
                struct cache_record *r = l;
 
                l = avl_next_element(l, avl);
@@ -226,6 +225,7 @@ 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 = (char *) mdns_buf;
 
        if (!(a->class & CLASS_IN))
                return;
@@ -300,8 +300,8 @@ 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);
+                       cache_record_free(r);
                } else {
                        r->ttl = a->ttl;
                        DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
@@ -335,3 +335,48 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
        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;
+       }
+}