ubus: constify name argument to mdns_add_records
[project/mdnsd.git] / cache.c
diff --git a/cache.c b/cache.c
index b244dae..07a0857 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -33,6 +33,7 @@
 #include <libubox/uloop.h>
 #include <libubox/avl-cmp.h>
 #include <libubox/blobmsg_json.h>
+#include <libubox/kvlist.h>
 #include <libubus.h>
 
 #include "cache.h"
 #include "dns.h"
 
 static struct uloop_timeout cache_gc;
-struct avl_tree records, entries, types, hosts;
+struct avl_tree records, entries, hosts;
 static struct blob_buf b;
 
+static struct kvlist types;
+
 static void
 cache_record_free(struct cache_record *r, int rem)
 {
@@ -63,10 +66,6 @@ cache_entry_free(struct cache_entry *s)
 {
        DBG(2, "%s\n", s->entry);
        avl_delete(&entries, &s->avl);
-       if (s->host)
-               free(s->host);
-       if (s->entry)
-               free(s->entry);
        free(s);
 }
 
@@ -103,41 +102,28 @@ static void
 cache_load_services(void)
 {
        struct blob_attr *cur;
-        int rem;
+       int rem;
 
-        blob_buf_init(&b, 0);
+       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) {
-               struct cache_type *t = malloc(sizeof(struct cache_type));
-
-               if (!t)
-                       continue;
-               t->avl.key = t->key = strdup(blobmsg_name(cur));
-               t->val = strdup(blobmsg_get_string(cur));
-               avl_insert(&types, &t->avl);
-       }
+       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)
 {
-       struct cache_type *t;
-
-       t = avl_find_element(&types, key, t, avl);
-       if (!t)
-               return NULL;
-
-       return t->val;
+       return kvlist_get(&types, key);
 }
 
 int
 cache_init(void)
 {
+       kvlist_init(&types, kvlist_strlen);
        avl_init(&entries, avl_strcmp, true, NULL);
-       avl_init(&types, avl_strcmp, false, NULL);
        avl_init(&records, avl_strcmp, true, NULL);
 
        cache_gc.cb = cache_gc_timer;
@@ -169,35 +155,29 @@ cache_scan(void)
 }
 
 static struct cache_entry*
-cache_find_entry(char *entry)
-{
-       struct cache_entry *s;
-
-       avl_for_each_element(&entries, s, avl)
-               if (!strcmp(s->entry, entry))
-                       return s;
-       return NULL;
-}
-
-static struct cache_entry*
 cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
 {
        struct cache_entry *s;
+       char *entry_buf;
+       char *host_buf;
        char *type;
 
-       s = cache_find_entry(entry);
+       s = avl_find_element(&entries, entry, s, avl);
        if (s)
                return s;
 
-       s = malloc(sizeof(struct cache_entry));
-       memset(s, 0, sizeof(struct cache_entry));
-       s->avl.key = s->entry = strdup(entry);
+       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->ttl = ttl;
 
        if (hlen)
-               s->host = strndup(s->entry, hlen);
-       type = strstr(s->entry, "._");
+               s->host = strncpy(host_buf, s->entry, hlen);
+
+       type = strstr(entry_buf, "._");
        if (type)
                type++;
        if (type)