move rdata_buffer to cache_answer()

[project/mdnsd.git] / cache.c

diff --git a/cache.c b/cache.c
index 4182016..c49b0fd 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -116,14 +116,16 @@ void cache_cleanup(void)
 void
 cache_scan(void)
 {
 void
 cache_scan(void)
 {

+       struct interface *iface;

        struct cache_entry *s;
 
        struct cache_entry *s;
 

-       avl_for_each_element(&entries, s, avl)
-               dns_send_question(cur_iface, s->entry, TYPE_PTR);
+       vlist_for_each_element(&interfaces, iface, node)
+               avl_for_each_element(&entries, s, avl)
+                       dns_send_question(iface, s->entry, TYPE_PTR);

 }
 
 static struct cache_entry*
 }
 
 static struct cache_entry*

-cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
+cache_entry(struct interface *iface, char *entry, int hlen, int ttl)

 {
        struct cache_entry *s;
        char *entry_buf;
 {
        struct cache_entry *s;
        char *entry_buf;


@@ -153,7 +155,7 @@ cache_entry(struct uloop_fd *u, char *entry, int hlen, int ttl)
        avl_insert(&entries, &s->avl);
 
        if (!hlen)
        avl_insert(&entries, &s->avl);
 
        if (!hlen)

-               dns_send_question(cur_iface, entry, TYPE_PTR);
+               dns_send_question(iface, entry, TYPE_PTR);

 
        return s;
 }
 
        return s;
 }


@@ -215,7 +217,7 @@ cache_host_is_known(char *record)
 }
 
 void
 }
 
 void

-cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata)
+cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata)

 {
        struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
        struct cache_record *r;
 {
        struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
        struct cache_record *r;


@@ -225,6 +227,8 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
        void *rdata_ptr, *txt_ptr;
        int host_len = 0;
 
        void *rdata_ptr, *txt_ptr;
        int host_len = 0;
 

+       static char rdata_buffer[MAX_DATA_LEN + 1];
+

        if (!(a->class & CLASS_IN))
                return;
 
        if (!(a->class & CLASS_IN))
                return;
 


@@ -248,7 +252,7 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
                    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
                        host_len = rdlength - nlen - 1;
 
                    nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
                        host_len = rdlength - nlen - 1;
 

-               cache_entry(u, rdata_buffer, host_len, a->ttl);
+               cache_entry(iface, rdata_buffer, host_len, a->ttl);

                return;
 
        case TYPE_SRV:
                return;
 
        case TYPE_SRV:


@@ -278,14 +282,14 @@ cache_answer(struct uloop_fd *u, uint8_t *base, int blen, char *name, struct dns
                break;
 
        case TYPE_A:
                break;
 
        case TYPE_A:

-               cache_entry(u, name, strlen(name), a->ttl);
+               cache_entry(iface, name, strlen(name), a->ttl);

                if (a->rdlength != 4)
                        return;
                dlen = 4;
                break;
 
        case TYPE_AAAA:
                if (a->rdlength != 4)
                        return;
                dlen = 4;
                break;
 
        case TYPE_AAAA:

-               cache_entry(u, name, strlen(name), a->ttl);
+               cache_entry(iface, name, strlen(name), a->ttl);

                if (a->rdlength != 16)
                        return;
                dlen = 16;
                if (a->rdlength != 16)
                        return;
                dlen = 16;