Changeset 0aa70f4 in mainline

Timestamp:

2013-07-19T13:23:00Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cd18cd1

Parents:

44c9ef4

Message:

support for IPv6 DNS name resolution (AAAA)
if the desired address family of the DNS query is not explicitly specified, then IPv6 addresses take precendece over IPv4 addresses

Location:

uspace

Files:

• app/dnsres/dnsres.c (modified) (1 diff)
• app/nettest1/nettest1.c (modified) (1 diff)
• app/nettest2/nettest2.c (modified) (1 diff)
• app/nettest3/nettest3.c (modified) (1 diff)
• app/nterm/conn.c (modified) (1 diff)
• app/ping/ping.c (modified) (1 diff)
• app/ping6/ping6.c (modified) (1 diff)
• lib/c/generic/dnsr.c (modified) (2 diffs)
• lib/c/include/inet/dnsr.h (modified) (1 diff)
• srv/net/dnsrsrv/dns_msg.c (modified) (3 diffs)
• srv/net/dnsrsrv/dns_msg.h (modified) (2 diffs)
• srv/net/dnsrsrv/dnsrsrv.c (modified) (2 diffs)
• srv/net/dnsrsrv/query.c (modified) (4 diffs)
• srv/net/dnsrsrv/query.h (modified) (1 diff)

uspace/app/dnsres/dnsres.c

@@ -60 +60 @@
         hname = argv[1];
 
-        rc = dnsr_name2host(hname, &hinfo);
+        rc = dnsr_name2host(hname, &hinfo, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving '%s'.\n", argv[1]);

uspace/app/nettest1/nettest1.c

@@ -335 +335 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {

uspace/app/nettest2/nettest2.c

@@ -271 +271 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {

uspace/app/nettest3/nettest3.c

@@ -78 +78 @@
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_name2host(argv[1], &hinfo);
+                        rc = dnsr_name2host(argv[1], &hinfo, AF_INET);
                         if (rc != EOK) {
                                 printf("Error resolving host '%s'.\n", argv[1]);

uspace/app/nterm/conn.c

@@ -84 +84 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, 0);
                 
                 if (rc != EOK) {

uspace/app/ping/ping.c

@@ -212 +212 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo);
+                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET);
                 if (rc != EOK) {
                         printf(NAME ": Error resolving host '%s'.\n", argv[argi]);

uspace/app/ping6/ping6.c

@@ -212 +212 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo);
+                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET6);
                 if (rc != EOK) {
                         printf(NAME ": Error resolving host '%s'.\n", argv[argi]);

uspace/lib/c/generic/dnsr.c

@@ -67 +67 @@
 }
 
-int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo)
+int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, uint16_t af)
 {
         dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
@@ -76 +76 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, DNSR_NAME2HOST, &answer);
+        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) af,
+            &answer);
         
         int rc = async_data_write_start(exch, name, str_size(name));

uspace/lib/c/include/inet/dnsr.h

@@ -51 +51 @@
 
 extern int dnsr_init(void);
-extern int dnsr_name2host(const char *, dnsr_hostinfo_t **);
+extern int dnsr_name2host(const char *, dnsr_hostinfo_t **, uint16_t);
 extern void dnsr_hostinfo_destroy(dnsr_hostinfo_t *);
 extern int dnsr_get_srvaddr(inet_addr_t *);

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -296 +296 @@
 uint32_t dns_uint32_t_decode(uint8_t *buf, size_t buf_size)
 {
-        uint32_t w;
         assert(buf_size >= 4);
-
-        w = ((uint32_t) buf[0] << 24) +
+        
+        uint32_t w = ((uint32_t) buf[0] << 24) +
             ((uint32_t) buf[1] << 16) +
             ((uint32_t) buf[2] << 8) +
             buf[3];
-
+        
         return w;
+}
+
+/** Decode unaligned big-endian 128-bit integer */
+void dns_addr128_t_decode(uint8_t *buf, size_t buf_size, addr128_t addr)
+{
+        assert(buf_size >= 16);
+        
+        addr128_t_be2host(buf, addr);
 }
 
@@ -400 +407 @@
         int rc;
 
-        rr = calloc(1, sizeof (dns_rr_t));
+        rr = calloc(1, sizeof(dns_rr_t));
         if (rr == NULL)
                 return ENOMEM;
@@ -427 +434 @@
 
         rr->rtype = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         rr->rclass = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         rr->ttl = dns_uint32_t_decode(bp, bsz);
-        bp += sizeof(uint32_t); bsz -= sizeof(uint32_t);
+        bp += sizeof(uint32_t);
+        bsz -= sizeof(uint32_t);
 
         rdlength = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         if (rdlength > bsz) {

uspace/srv/net/dnsrsrv/dns_msg.h

@@ -40 +40 @@
 #include <stdbool.h>
 #include <stdint.h>
+#include <inet/addr.h>
 #include "dns_std.h"
 #include "dns_type.h"
@@ -49 +50 @@
 extern int dns_name_decode(dns_pdu_t *, size_t, char **, size_t *);
 extern uint32_t dns_uint32_t_decode(uint8_t *, size_t);
+extern void dns_addr128_t_decode(uint8_t *, size_t, addr128_t);
+
 
 #endif

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -89 +89 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
         
+        uint16_t af = IPC_GET_ARG1(*icall);
+        
         char *name;
         int rc = async_data_write_accept((void **) &name, true, 0,
@@ -98 +100 @@
         
         dns_host_info_t *hinfo;
-        rc = dns_name2host(name, &hinfo);
+        rc = dns_name2host(name, &hinfo, af);
         if (rc != EOK) {
                 async_answer_0(iid, rc);

uspace/srv/net/dnsrsrv/query.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <str.h>
-
+#include <net/socket_codes.h>
 #include "dns_msg.h"
 #include "dns_std.h"
@@ -48 +48 @@
 static uint16_t msg_id;
 
-int dns_name2host(const char *name, dns_host_info_t **rinfo)
+static int dns_name_query(const char *name, dns_qtype_t qtype,
+    dns_host_info_t *info)
 {
-        dns_message_t *msg;
-        dns_message_t *amsg;
-        dns_question_t *question;
-        dns_host_info_t *info;
-        char *sname, *cname;
-        size_t eoff;
-        int rc;
-
-        question = calloc(1, sizeof(dns_question_t));
-        if (question == NULL)
-                return ENOMEM;
-
-        question->qname = (char *)name;
-        question->qtype = DTYPE_A;
+        /* Start with the caller-provided name */
+        char *sname = str_dup(name);
+        if (sname == NULL)
+                return ENOMEM;
+        
+        char *qname = str_dup(name);
+        if (qname == NULL) {
+                free(sname);
+                return ENOMEM;
+        }
+        
+        dns_question_t *question = calloc(1, sizeof(dns_question_t));
+        if (question == NULL) {
+                free(qname);
+                free(sname);
+                return ENOMEM;
+        }
+        
+        question->qname = qname;
+        question->qtype = qtype;
         question->qclass = DC_IN;
-
-        msg = dns_message_new();
-        if (msg == NULL)
-                return ENOMEM;
-
-        list_append(&question->msg, &msg->question);
-
+        
+        dns_message_t *msg = dns_message_new();
+        if (msg == NULL) {
+                free(question);
+                free(qname);
+                free(sname);
+                return ENOMEM;
+        }
+        
         msg->id = msg_id++;
         msg->qr = QR_QUERY;
@@ -79 +88 @@
         msg->rd = true;
         msg->ra = false;
-
-        rc = dns_request(msg, &amsg);
+        
+        list_append(&question->msg, &msg->question);
+        
+        dns_message_t *amsg;
+        int rc = dns_request(msg, &amsg);
         if (rc != EOK) {
+                dns_message_destroy(msg);
+                free(sname);
                 return rc;
         }
-
-        /* Start with the caller-provided name */
-        sname = str_dup(name);
-
+        
         list_foreach(amsg->answer, link) {
                 dns_rr_t *rr = list_get_instance(link, dns_rr_t, msg);
-
+                
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu",
-                        rr->name, rr->rtype, rr->rclass, rr->rdata_size);
-
-                if (rr->rtype == DTYPE_CNAME && rr->rclass == DC_IN &&
-                    str_cmp(rr->name, sname) == 0) {
+                    rr->name, rr->rtype, rr->rclass, rr->rdata_size);
+                
+                if ((rr->rtype == DTYPE_CNAME) && (rr->rclass == DC_IN) &&
+                    (str_cmp(rr->name, sname) == 0)) {
+                        
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "decode cname (%p, %zu, %zu)",
                             amsg->pdu.data, amsg->pdu.size, rr->roff);
+                        
+                        char *cname;
+                        size_t eoff;
                         rc = dns_name_decode(&amsg->pdu, rr->roff, &cname, &eoff);
                         if (rc != EOK) {
-                                log_msg(LOG_DEFAULT, LVL_DEBUG,
-                                    "error decoding cname");
-                                assert(rc == EINVAL || rc == ENOMEM);
+                                assert((rc == EINVAL) || (rc == ENOMEM));
+                                
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "error decoding cname");
+                                
                                 dns_message_destroy(msg);
                                 dns_message_destroy(amsg);
+                                free(sname);
+                                
                                 return rc;
                         }
-
+                        
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "name = '%s' "
                             "cname = '%s'", sname, cname);
-
+                        
+                        /* Continue looking for the more canonical name */
                         free(sname);
-                        /* Continue looking for the more canonical name */
                         sname = cname;
                 }
-
-                if (rr->rtype == DTYPE_A && rr->rclass == DC_IN &&
-                        rr->rdata_size == sizeof(uint32_t) &&
-                            str_cmp(rr->name, sname) == 0) {
-
-                        info = calloc(1, sizeof(dns_host_info_t));
-                        if (info == NULL) {
+                
+                if ((qtype == DTYPE_A) && (rr->rtype == DTYPE_A) &&
+                    (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr32_t)) &&
+                    (str_cmp(rr->name, sname) == 0)) {
+                        
+                        info->cname = str_dup(rr->name);
+                        if (info->cname == NULL) {
                                 dns_message_destroy(msg);
                                 dns_message_destroy(amsg);
+                                free(sname);
+                                
                                 return ENOMEM;
                         }
-
-                        info->cname = str_dup(rr->name);
+                        
                         inet_addr_set(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
                             &info->addr);
@@ -133 +152 @@
                         dns_message_destroy(msg);
                         dns_message_destroy(amsg);
-                        *rinfo = info;
+                        free(sname);
+                        
                         return EOK;
                 }
-        }
-
+                
+                if ((qtype == DTYPE_AAAA) && (rr->rtype == DTYPE_AAAA) &&
+                    (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr128_t)) &&
+                    (str_cmp(rr->name, sname) == 0)) {
+                
+                        info->cname = str_dup(rr->name);
+                        if (info->cname == NULL) {
+                                dns_message_destroy(msg);
+                                dns_message_destroy(amsg);
+                                free(sname);
+                                
+                                return ENOMEM;
+                        }
+                        
+                        addr128_t addr;
+                        dns_addr128_t_decode(rr->rdata, rr->rdata_size, addr);
+                        
+                        inet_addr_set6(addr, &info->addr);
+                        
+                        dns_message_destroy(msg);
+                        dns_message_destroy(amsg);
+                        free(sname);
+                        
+                        return EOK;
+                }
+        }
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname);
+        
         dns_message_destroy(msg);
         dns_message_destroy(amsg);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname);
-
+        free(sname);
+        
         return EIO;
+}
+
+int dns_name2host(const char *name, dns_host_info_t **rinfo, uint16_t af)
+{
+        dns_host_info_t *info = calloc(1, sizeof(dns_host_info_t));
+        if (info == NULL)
+                return ENOMEM;
+        
+        int rc;
+        
+        switch (af) {
+        case AF_NONE:
+                rc = dns_name_query(name, DTYPE_AAAA, info);
+                
+                if (rc != EOK)
+                        rc = dns_name_query(name, DTYPE_A, info);
+                
+                break;
+        case AF_INET:
+                rc = dns_name_query(name, DTYPE_A, info);
+                break;
+        case AF_INET6:
+                rc = dns_name_query(name, DTYPE_AAAA, info);
+                break;
+        default:
+                rc = EINVAL;
+        }
+        
+        if (rc == EOK)
+                *rinfo = info;
+        else
+                free(info);
+        
+        return rc;
 }
 

uspace/srv/net/dnsrsrv/query.h

@@ -39 +39 @@
 #include "dns_type.h"
 
-extern int dns_name2host(const char *, dns_host_info_t **);
+extern int dns_name2host(const char *, dns_host_info_t **, uint16_t);
 extern void dns_hostinfo_destroy(dns_host_info_t *);