Changeset 959d2ec in mainline for uspace/lib/c/generic/dnsr.c

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.

File:

• uspace/lib/c/generic/dnsr.c (modified) (5 diffs)

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);
 }