entry->service

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/cache.c b/cache.c
index 2b5ca541d3216f4e34aac837f5102722ef4857fe..190290a9afa3ab7a9343355051d82dea82866646 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -41,7 +41,7 @@
 #include "interface.h"
 
 static struct uloop_timeout cache_gc;
-struct avl_tree entries;
+struct avl_tree services;
 static AVL_TREE(records, avl_strcmp, true, NULL);
 
 static void
@@ -53,10 +53,10 @@ cache_record_free(struct cache_record *r)
 }
 
 static void
-cache_entry_free(struct cache_entry *s)
+cache_service_free(struct cache_service *s)
 {
        DBG(2, "%s\n", s->entry);
-       avl_delete(&entries, &s->avl);
+       avl_delete(&services, &s->avl);
        free(s);
 }
 
@@ -73,17 +73,17 @@ static void
 cache_gc_timer(struct uloop_timeout *timeout)
 {
        struct cache_record *r, *p;
-       struct cache_entry *s, *t;
+       struct cache_service *s, *t;
 
        avl_for_each_element_safe(&records, r, avl, p)
                if (cache_is_expired(r->time, r->ttl))
                        cache_record_free(r);
 
-       avl_for_each_element_safe(&entries, s, avl, t) {
+       avl_for_each_element_safe(&services, s, avl, t) {
                if (!s->host)
                        continue;
                if (cache_is_expired(s->time, s->ttl))
-                       cache_entry_free(s);
+                       cache_service_free(s);
        }
 
        uloop_timeout_set(timeout, 10000);
@@ -92,7 +92,7 @@ cache_gc_timer(struct uloop_timeout *timeout)
 int
 cache_init(void)
 {
-       avl_init(&entries, avl_strcmp, true, NULL);
+       avl_init(&services, avl_strcmp, true, NULL);
 
        cache_gc.cb = cache_gc_timer;
        uloop_timeout_set(&cache_gc, 10000);
@@ -103,35 +103,35 @@ cache_init(void)
 void cache_cleanup(void)
 {
        struct cache_record *r, *p;
-       struct cache_entry *s, *t;
+       struct cache_service *s, *t;
 
        avl_for_each_element_safe(&records, r, avl, p)
                cache_record_free(r);
 
-       avl_for_each_element_safe(&entries, s, avl, t)
-               cache_entry_free(s);
+       avl_for_each_element_safe(&services, s, avl, t)
+               cache_service_free(s);
 }
 
 void
 cache_scan(void)
 {
        struct interface *iface;
-       struct cache_entry *s;
+       struct cache_service *s;
 
        vlist_for_each_element(&interfaces, iface, node)
-               avl_for_each_element(&entries, s, avl)
+               avl_for_each_element(&services, s, avl)
                        dns_send_question(iface, s->entry, TYPE_PTR, 1);
 }
 
-static struct cache_entry*
-cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
+static struct cache_service*
+cache_service(struct interface *iface, char *entry, int hlen, int ttl)
 {
-       struct cache_entry *s, *t;
+       struct cache_service *s, *t;
        char *entry_buf;
        char *host_buf;
        char *type;
 
-       avl_for_each_element_safe(&entries, s, avl, t)
+       avl_for_each_element_safe(&services, s, avl, t)
                if (!strcmp(s->entry, entry))
                        return s;
 
@@ -151,7 +151,7 @@ cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
                type++;
        if (type)
                s->avl.key = type;
-       avl_insert(&entries, &s->avl);
+       avl_insert(&services, &s->avl);
 
        if (!hlen)
                dns_send_question(iface, entry, TYPE_PTR, !iface->multicast);
@@ -247,7 +247,7 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
                    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
                        host_len = rdlength - nlen - 1;
 
-               cache_entry(iface, rdata_buffer, host_len, a->ttl);
+               cache_service(iface, rdata_buffer, host_len, a->ttl);
                return;
 
        case TYPE_SRV:
@@ -277,14 +277,14 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
                break;
 
        case TYPE_A:
-               cache_entry(iface, name, strlen(name), a->ttl);
+               cache_service(iface, name, strlen(name), a->ttl);
                if (a->rdlength != 4)
                        return;
                dlen = 4;
                break;
 
        case TYPE_AAAA:
-               cache_entry(iface, name, strlen(name), a->ttl);
+               cache_service(iface, name, strlen(name), a->ttl);
                if (a->rdlength != 16)
                        return;
                dlen = 16;

diff --git a/cache.h b/cache.h
index df3593f3df55fd9363f6b85b564d3723cbbbe788..72bd08c7a043fc9dc04a6e5284ddc46f41c94116 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -20,7 +20,7 @@
 
 #include "dns.h"
 
-struct cache_entry {
+struct cache_service {
        struct avl_node avl;
 
        const char *entry;
@@ -42,7 +42,7 @@ struct cache_record {
        time_t time;
 };
 
-extern struct avl_tree entries;
+extern struct avl_tree services;
 
 int cache_init(void);
 void cache_scan(void);

diff --git a/ubus.c b/ubus.c
index 32e30876ed5c276ee4962e68679ef277b39316bf..67c3af73cc1a8c276ad12af94ae96aa29c827860 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -52,12 +52,12 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
-       struct cache_entry *s, *q;
+       struct cache_service *s, *q;
        char *buffer = (char *) mdns_buf;
        void *c1 = NULL, *c2;
 
        blob_buf_init(&b, 0);
-       avl_for_each_element(&entries, s, avl) {
+       avl_for_each_element(&services, s, avl) {
                char *local;
                if (*((char *) s->avl.key) != '_')
                        continue;
@@ -81,7 +81,7 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                cache_dump_records(&b, s->entry);
                blobmsg_close_table(&b, c2);
                q = avl_next_element(s, avl);
-               if (!q || avl_is_last(&entries, &s->avl) || strcmp(s->avl.key, q->avl.key)) {
+               if (!q || avl_is_last(&services, &s->avl) || strcmp(s->avl.key, q->avl.key)) {
                        blobmsg_close_table(&b, c1);
                        c1 = NULL;
                }
@@ -96,12 +96,12 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
-       struct cache_entry *s;
+       struct cache_service *s;
        char *buffer = (char *) mdns_buf;
        void *c;
 
        blob_buf_init(&b, 0);
-       avl_for_each_element(&entries, s, avl) {
+       avl_for_each_element(&services, s, avl) {
                char *local;
                if (*((char *) s->avl.key) == '_')
                        continue;