Changeset 0773396 in mainline for uspace/lib/c/generic/inetping.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/inetping.c (modified) (4 diffs)

uspace/lib/c/generic/inetping.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2013 Martin Decky
  * All rights reserved.
  *
@@ -49 +50 @@
 
         assert(inetping_sess == NULL);
-        
+
         inetping_ev_ops = ev_ops;
-        
+
         rc = loc_service_get_id(SERVICE_NAME_INETPING, &inetping_svc,
             IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return ENOENT;
-        
+
         inetping_sess = loc_service_connect(EXCHANGE_SERIALIZE, inetping_svc,
             IPC_FLAG_BLOCKING);
         if (inetping_sess == NULL)
                 return ENOENT;
-        
+
         async_exch_t *exch = async_exchange_begin(inetping_sess);
 
         rc = async_connect_to_me(exch, 0, 0, 0, inetping_cb_conn, NULL);
         async_exchange_end(exch);
-        
+
         if (rc != EOK) {
                 async_hangup(inetping_sess);
@@ -72 +73 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -79 +80 @@
 {
         async_exch_t *exch = async_exchange_begin(inetping_sess);
-        
+
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INETPING_SEND, (sysarg_t) sdu->src,
-            (sysarg_t) sdu->dest, sdu->seq_no, &answer);
-        sysarg_t retval = async_data_write_start(exch, sdu->data, sdu->size);
-        
+        aid_t req = async_send_1(exch, INETPING_SEND, sdu->seq_no, &answer);
+
+        int rc = async_data_write_start(exch, &sdu->src, sizeof(sdu->src));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        rc = async_data_write_start(exch, &sdu->dest, sizeof(sdu->dest));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        rc = async_data_write_start(exch, sdu->data, sdu->size);
+
         async_exchange_end(exch);
-        
-        if (retval != EOK) {
-                async_forget(req);
-                return retval;
-        }
-        
+
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        sysarg_t retval;
         async_wait_for(req, &retval);
-        return retval;
-}
-
-int inetping_get_srcaddr(uint32_t remote, uint32_t *local)
+
+        return (int) retval;
+}
+
+int inetping_get_srcaddr(const inet_addr_t *remote, inet_addr_t *local)
 {
         async_exch_t *exch = async_exchange_begin(inetping_sess);
-        
-        sysarg_t local_addr;
-        int rc = async_req_1_1(exch, INETPING_GET_SRCADDR, (sysarg_t) remote,
-            &local_addr);
-        
+
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, INETPING_GET_SRCADDR, &answer);
+
+        int rc = async_data_write_start(exch, remote, sizeof(*remote));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        ipc_call_t answer_local;
+        aid_t req_local = async_data_read(exch, local, sizeof(*local),
+            &answer_local);
+
         async_exchange_end(exch);
-        
-        if (rc != EOK)
-                return rc;
-        
-        *local = (uint32_t) local_addr;
-        return EOK;
-}
-
-static void inetping_ev_recv(ipc_callid_t callid, ipc_call_t *call)
+
+        sysarg_t retval_local;
+        async_wait_for(req_local, &retval_local);
+
+        if (retval_local != EOK) {
+                async_forget(req);
+                return (int) retval_local;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+
+        return (int) retval;
+}
+
+static void inetping_ev_recv(ipc_callid_t iid, ipc_call_t *icall)
 {
         inetping_sdu_t sdu;
-        
-        sdu.src = IPC_GET_ARG1(*call);
-        sdu.dest = IPC_GET_ARG2(*call);
-        sdu.seq_no = IPC_GET_ARG3(*call);
-        
-        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
+
+        sdu.seq_no = IPC_GET_ARG1(*icall);
+
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(sdu.src)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        int rc = async_data_write_finalize(callid, &sdu.src, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
-                return;
-        }
-        
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(sdu.dest)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(callid, &sdu.dest, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
         rc = inetping_ev_ops->recv(&sdu);
         free(sdu.data);
-        async_answer_0(callid, rc);
+        async_answer_0(iid, rc);
 }