Changes in uspace/srv/net/dnsrsrv/query.c [716357f:959d2ec] in mainline

File:

• uspace/srv/net/dnsrsrv/query.c (modified) (5 diffs)

uspace/srv/net/dnsrsrv/query.c

@@ -54 +54 @@
         dns_question_t *question;
         dns_host_info_t *info;
+        char *sname, *cname;
+        size_t eoff;
         int rc;
 
@@ -83 +85 @@
         }
 
+        /* 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);
@@ -89 +94 @@
                         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);
+                        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);
+                                dns_message_destroy(msg);
+                                dns_message_destroy(amsg);
+                                return rc;
+                        }
+
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "name = '%s' "
+                            "cname = '%s'", sname, cname);
+
+                        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)) {
+                        rr->rdata_size == sizeof(uint32_t) &&
+                            str_cmp(rr->name, sname) == 0) {
 
                         info = calloc(1, sizeof(dns_host_info_t));
                         if (info == NULL) {
+                                dns_message_destroy(msg);
                                 dns_message_destroy(amsg);
                                 return ENOMEM;
                         }
 
-                        info->name = str_dup(rr->name);
+                        info->cname = str_dup(rr->name);
                         info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "info->addr = %x",
-                            info->addr.ipv4);
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "info->name = '%s' "
+                            "info->addr = %x", info->cname, info->addr.ipv4);
 
                         dns_message_destroy(msg);
@@ -112 +141 @@
         dns_message_destroy(msg);
         dns_message_destroy(amsg);
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "No A/IN found, fail");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname);
 
         return EIO;
@@ -119 +148 @@
 void dns_hostinfo_destroy(dns_host_info_t *info)
 {
-        free(info->name);
+        free(info->cname);
         free(info);
 }