ipv6 cleanup

[project/mdnsd.git] / dns.c

diff --git a/dns.c b/dns.c
index 585b40f..1ff5d53 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -66,7 +66,7 @@ dns_type_string(uint16_t type)
 }
 
 void
-dns_send_question(struct interface *iface, const char *question, int type)
+dns_send_question(struct interface *iface, const char *question, int type, int unicast)
 {
        static struct dns_header h;
        static struct dns_question q;
@@ -86,7 +86,7 @@ dns_send_question(struct interface *iface, const char *question, int type)
        int len;
 
        h.questions = cpu_to_be16(1);
-       q.class = cpu_to_be16(1);
+       q.class = cpu_to_be16(((unicast) ? (CLASS_UNICAST) : (0))  | 1);
        q.type = cpu_to_be16(type);
 
        len = dn_comp(question, (void *) name_buffer, sizeof(name_buffer), NULL, NULL);
@@ -95,10 +95,9 @@ dns_send_question(struct interface *iface, const char *question, int type)
 
        iov[1].iov_len = len;
 
+       DBG(1, "Q <- %s %s\n", dns_type_string(type), question);
        if (interface_send_packet(iface, iov, ARRAY_SIZE(iov)) < 0)
-               fprintf(stderr, "failed to send question\n");
-       else
-               DBG(1, "Q <- %s %s\n", dns_type_string(type), question);
+               perror("failed to send question :");
 }
 
 
@@ -120,7 +119,7 @@ dns_init_answer(void)
 }
 
 void
-dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength)
+dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength, int ttl)
 {
        struct blob_attr *attr;
        struct dns_answer *a;
@@ -129,7 +128,7 @@ dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength)
        a = blob_data(attr);
        a->type = cpu_to_be16(type);
        a->class = cpu_to_be16(1);
-       a->ttl = cpu_to_be32(announce_ttl);
+       a->ttl = cpu_to_be32(ttl);
        a->rdlength = cpu_to_be16(rdlength);
        memcpy(a + 1, rdata, rdlength);
 
@@ -320,17 +319,20 @@ parse_question(struct interface *iface, char *name, struct dns_question *q)
 {
        char *host;
 
+       if ((q->class & CLASS_UNICAST) && iface->multicast)
+               iface = iface->peer;
+
        DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name);
 
        switch (q->type) {
        case TYPE_ANY:
                if (!strcmp(name, mdns_hostname_local))
-                       service_reply(iface, NULL);
+                       service_reply(iface, NULL, announce_ttl);
                break;
 
        case TYPE_PTR:
                service_announce_services(iface, name);
-               service_reply(iface, name);
+               service_reply(iface, name, announce_ttl);
                break;
 
        case TYPE_AAAA:
@@ -339,13 +341,13 @@ parse_question(struct interface *iface, char *name, struct dns_question *q)
                if (host)
                        *host = '\0';
                if (!strcmp(mdns_hostname, name))
-                       service_reply_a(iface, q->type);
+                       service_reply_a(iface, q->type, announce_ttl);
                break;
        };
 }
 
 void
-dns_handle_packet(struct interface *iface, uint8_t *buffer, int len)
+dns_handle_packet(struct interface *iface, uint8_t *buffer, int len, int unicast)
 {
        struct dns_header *h;
        uint8_t *b = buffer;