Changeset 959d2ec in mainline

Timestamp:

2013-05-08T10:29:45Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d242cb6

Parents:

9f029aa

Message:

Return canonical name to caller.

Location:

uspace

Files:

• app/dnsres/dnsres.c (modified) (3 diffs)
• app/ping/ping.c (modified) (1 diff)
• lib/c/generic/dnsr.c (modified) (5 diffs)
• lib/c/include/inet/dnsr.h (modified) (1 diff)
• srv/net/dnsrsrv/dns_type.h (modified) (1 diff)
• srv/net/dnsrsrv/dnsrsrv.c (modified) (2 diffs)
• srv/net/dnsrsrv/query.c (modified) (2 diffs)

uspace/app/dnsres/dnsres.c

@@ -50 +50 @@
         int rc;
         dnsr_hostinfo_t *hinfo;
+        char *hname;
         char *saddr;
 
@@ -57 +58 @@
         }
 
-        rc = dnsr_name2host(argv[1], &hinfo);
+        hname = argv[1];
+
+        rc = dnsr_name2host(hname, &hinfo);
         if (rc != EOK) {
                 printf(NAME ": Error resolving '%s'.\n", argv[1]);
@@ -70 +73 @@
         }
 
-        printf("Host name: %s address: %s\n", hinfo->name, saddr);
+        printf("Host name: %s\n", hname);
+        if (str_cmp(hname, hinfo->cname) != 0)
+                printf("Canonical name: %s\n", hinfo->cname);
+        printf("Address: %s\n", saddr);
+
         dnsr_hostinfo_destroy(hinfo);
         free(saddr);

uspace/app/ping/ping.c

@@ -234 +234 @@
 
         if (hinfo != NULL) {
-                rc = asprintf(&sdest, "%s (%s)", hinfo->name, adest);
+                rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
                         printf(NAME ": Out of memory.\n");

uspace/lib/c/generic/dnsr.c

@@ -71 +71 @@
 {
         async_exch_t *exch = dnsr_exchange_begin();
+        char cname_buf[DNSR_NAME_MAX_SIZE + 1];
+        ipc_call_t cnreply;
+        size_t act_size;
         dnsr_hostinfo_t *info;
 
@@ -76 +79 @@
         aid_t req = async_send_0(exch, DNSR_NAME2HOST, &answer);
         sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+        aid_t cnreq = async_data_read(exch, cname_buf, DNSR_NAME_MAX_SIZE,
+            &cnreply);
 
         dnsr_exchange_end(exch);
@@ -81 +86 @@
         if (retval != EOK) {
                 async_forget(req);
+                async_forget(cnreq);
                 return retval;
         }
 
         async_wait_for(req, &retval);
+        if (retval != EOK) {
+                async_forget(cnreq);
+                return EIO;
+        }
+
+        async_wait_for(cnreq, &retval);
         if (retval != EOK)
                 return EIO;
@@ -92 +104 @@
                 return ENOMEM;
 
-        info->name = str_dup(name);
+        act_size = IPC_GET_ARG2(cnreply);
+        assert(act_size <= DNSR_NAME_MAX_SIZE);
+        cname_buf[act_size] = '\0';
+
+        info->cname = str_dup(cname_buf);
         info->addr.ipv4 = IPC_GET_ARG1(answer);
 
@@ -104 +120 @@
                 return;
 
-        free(info->name);
+        free(info->cname);
         free(info);
 }

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

@@ -38 +38 @@
 #include <inet/inet.h>
 
+enum {
+        DNSR_NAME_MAX_SIZE = 255
+};
+
 typedef struct {
-        /** Host name */
-        char *name;
+        /** Host canonical name */
+        char *cname;
         /** Host address */
         inet_addr_t addr;

uspace/srv/net/dnsrsrv/dns_type.h

@@ -113 +113 @@
 typedef struct {
         /** Host name */
-        char *name;
+        char *cname;
         /** Host address */
         inet_addr_t addr;

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -89 +89 @@
         char *name;
         dns_host_info_t *hinfo;
+        ipc_callid_t rcallid;
+        size_t size;
+        sysarg_t retval;
+        size_t act_size;
         int rc;
 
@@ -100 +104 @@
         }
 
+        if (!async_data_read_receive(&rcallid, &size)) {
+                async_answer_0(rcallid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
         rc = dns_name2host(name, &hinfo);
         if (rc != EOK) {
+                async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
                 return;
         }
 
-        async_answer_1(callid, EOK, hinfo->addr.ipv4);
+        act_size = str_size(hinfo->cname);
+        if (act_size > size) {
+                async_answer_0(rcallid, EOVERFLOW);
+                async_answer_0(callid, EOVERFLOW);
+                return;
+        }
+
+        retval = async_data_read_finalize(rcallid, hinfo->cname, act_size);
+        async_answer_1(callid, retval, hinfo->addr.ipv4);
 
         dns_hostinfo_destroy(hinfo);

uspace/srv/net/dnsrsrv/query.c

@@ -127 +127 @@
                         }
 
-                        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->name = '%s' "
-                            "info->addr = %x", info->name, info->addr.ipv4);
+                            "info->addr = %x", info->cname, info->addr.ipv4);
 
                         dns_message_destroy(msg);
@@ -148 +148 @@
 void dns_hostinfo_destroy(dns_host_info_t *info)
 {
-        free(info->name);
+        free(info->cname);
         free(info);
 }