Changeset 47f5a77 in mainline for uspace/lib/c/generic/inetping6.c

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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/inetping6.c (modified) (3 diffs)

uspace/lib/c/generic/inetping6.c

@@ -79 +79 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INETPING6_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, INETPING6_SEND, sdu->seq_no, &answer);
+        
+        int rc = async_data_write_start(exch, &sdu->src, sizeof(addr128_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+        
+        rc = async_data_write_start(exch, &sdu->dest, sizeof(addr128_t));
+        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;
+        
+        return (int) retval;
 }
 
@@ -142 +158 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr128_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -161 +177 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr128_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);