clean up hostname handling, make service_name() static

[project/mdnsd.git] / cache.c

diff --git a/cache.c b/cache.c
index c49b0fd..89bd015 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -42,7 +42,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 +94,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);
@@ -337,3 +337,45 @@ 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, *q = avl_find_element(&records, name, r, avl);
+       const char *txt;
+       char buffer[INET6_ADDRSTRLEN];
+
+       if (!q)
+               return;
+
+       do {
+               r = q;
+               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;
+               }
+               q = avl_next_element(r, avl);
+       } while (q && !strcmp(r->record, q->record));
+}