Changes in uspace/lib/c/generic/inetping.c [a46e56b:a35b458] in mainline

File:

• uspace/lib/c/generic/inetping.c (modified) (6 diffs)

uspace/lib/c/generic/inetping.c

@@ -38 +38 @@
 #include <str.h>
 
-static void inetping_cb_conn(cap_call_handle_t, ipc_call_t *, void *);
-static void inetping_ev_recv(cap_call_handle_t, ipc_call_t *);
+static void inetping_cb_conn(ipc_callid_t, ipc_call_t *, void *);
+static void inetping_ev_recv(ipc_callid_t, ipc_call_t *);
 
 static async_sess_t *inetping_sess = NULL;
@@ -150 +150 @@
 }
 
-static void inetping_ev_recv(cap_call_handle_t icall_handle, ipc_call_t *icall)
+static void inetping_ev_recv(ipc_callid_t iid, ipc_call_t *icall)
 {
         inetping_sdu_t sdu;
@@ -156 +156 @@
         sdu.seq_no = IPC_GET_ARG1(*icall);
 
-        cap_call_handle_t chandle;
+        ipc_callid_t callid;
         size_t size;
-        if (!async_data_write_receive(&chandle, &size)) {
-                async_answer_0(chandle, EREFUSED);
-                async_answer_0(icall_handle, EREFUSED);
+        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(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        errno_t rc = async_data_write_finalize(chandle, &sdu.src, size);
-        if (rc != EOK) {
-                async_answer_0(chandle, rc);
-                async_answer_0(icall_handle, rc);
-                return;
-        }
-
-        if (!async_data_write_receive(&chandle, &size)) {
-                async_answer_0(chandle, EREFUSED);
-                async_answer_0(icall_handle, EREFUSED);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        errno_t rc = async_data_write_finalize(callid, &sdu.src, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                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(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(chandle, &sdu.dest, size);
-        if (rc != EOK) {
-                async_answer_0(chandle, rc);
-                async_answer_0(icall_handle, rc);
+                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;
         }
@@ -198 +198 @@
         rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
         if (rc != EOK) {
-                async_answer_0(icall_handle, rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -204 +204 @@
         rc = inetping_ev_ops->recv(&sdu);
         free(sdu.data);
-        async_answer_0(icall_handle, rc);
-}
-
-static void inetping_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+        async_answer_0(iid, rc);
+}
+
+static void inetping_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                ipc_callid_t callid = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -220 +220 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case INETPING_EV_RECV:
-                        inetping_ev_recv(chandle, &call);
+                        inetping_ev_recv(callid, &call);
                         break;
                 default:
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(callid, ENOTSUP);
                 }
         }