Changeset 98abd40 in mainline for uspace/lib/c/generic/dnsr.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

uspace/lib/c/generic/dnsr.c

@@ -44 +44 @@
 static async_exch_t *dnsr_exchange_begin(void)
 {
-        async_sess_t *sess;
-        service_id_t dnsr_svc;
-
         fibril_mutex_lock(&dnsr_sess_mutex);
-
+        
         if (dnsr_sess == NULL) {
+                service_id_t dnsr_svc;
+                
                 (void) loc_service_get_id(SERVICE_NAME_DNSR, &dnsr_svc,
                     IPC_FLAG_BLOCKING);
-
+                
                 dnsr_sess = loc_service_connect(EXCHANGE_SERIALIZE, dnsr_svc,
                     IPC_FLAG_BLOCKING);
         }
-
-        sess = dnsr_sess;
+        
+        async_sess_t *sess = dnsr_sess;
         fibril_mutex_unlock(&dnsr_sess_mutex);
-
+        
         return async_exchange_begin(sess);
 }
@@ -70 +69 @@
 int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo)
 {
+        dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
+        if (info == NULL)
+                return ENOMEM;
+        
         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;
-
+        
         ipc_call_t answer;
         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);
-
+        
+        int rc = async_data_write_start(exch, name, str_size(name));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+        
+        ipc_call_t answer_addr;
+        aid_t req_addr = async_data_read(exch, &info->addr,
+            sizeof(inet_addr_t), &answer_addr);
+        
+        sysarg_t retval_addr;
+        async_wait_for(req_addr, &retval_addr);
+        
+        if (retval_addr != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return (int) retval_addr;
+        }
+        
+        ipc_call_t answer_cname;
+        char cname_buf[DNSR_NAME_MAX_SIZE + 1];
+        aid_t req_cname = async_data_read(exch, cname_buf, DNSR_NAME_MAX_SIZE,
+            &answer_cname);
+        
         dnsr_exchange_end(exch);
-
-        if (retval != EOK) {
+        
+        sysarg_t retval_cname;
+        async_wait_for(req_cname, &retval_cname);
+        
+        if (retval_cname != EOK) {
                 async_forget(req);
-                async_forget(cnreq);
-                return retval;
+                return (int) retval_cname;
         }
-
+        
+        sysarg_t retval;
         async_wait_for(req, &retval);
-        if (retval != EOK) {
-                async_forget(cnreq);
-                return EIO;
-        }
-
-        async_wait_for(cnreq, &retval);
+        
         if (retval != EOK)
-                return EIO;
-
-        info = calloc(1, sizeof(dnsr_hostinfo_t));
-        if (info == NULL)
-                return ENOMEM;
-
-        act_size = IPC_GET_ARG2(cnreply);
+                return (int) retval;
+        
+        size_t act_size = IPC_GET_ARG2(answer_cname);
         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);
-
+        
         *rinfo = info;
         return EOK;
@@ -119 +134 @@
         if (info == NULL)
                 return;
-
+        
         free(info->cname);
         free(info);
@@ -126 +141 @@
 int dnsr_get_srvaddr(inet_addr_t *srvaddr)
 {
-        sysarg_t addr;
         async_exch_t *exch = dnsr_exchange_begin();
-
-        int rc = async_req_0_1(exch, DNSR_GET_SRVADDR, &addr);
-        dnsr_exchange_end(exch);
-
-        if (rc != EOK)
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, DNSR_GET_SRVADDR, &answer);
+        int rc = async_data_read_start(exch, srvaddr, sizeof(inet_addr_t));
+        
+        loc_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
                 return rc;
-
-        srvaddr->ipv4 = addr;
-        return EOK;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        return (int) retval;
 }
 
@@ -142 +163 @@
 {
         async_exch_t *exch = dnsr_exchange_begin();
-
-        int rc = async_req_1_0(exch, DNSR_SET_SRVADDR, srvaddr->ipv4);
-        dnsr_exchange_end(exch);
-
-        if (rc != EOK)
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, DNSR_SET_SRVADDR, &answer);
+        int rc = async_data_write_start(exch, srvaddr, sizeof(inet_addr_t));
+        
+        loc_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
                 return rc;
-
-        return EOK;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        return (int) retval;
 }