Changes in uspace/srv/net/inetsrv/inetping.c [a46e56b:5a6cc679] in mainline

File:

• uspace/srv/net/inetsrv/inetping.c (modified) (9 diffs)

uspace/srv/net/inetsrv/inetping.c

@@ -136 +136 @@
 }
 
-static void inetping_send_srv(inetping_client_t *client, cap_call_handle_t icall_handle,
+static void inetping_send_srv(inetping_client_t *client, ipc_callid_t iid,
     ipc_call_t *icall)
 {
@@ -146 +146 @@
         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;
-        }
-
-        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;
+        }
+
+        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;
         }
@@ -189 +189 @@
             &sdu.size);
         if (rc != EOK) {
-                async_answer_0(icall_handle, rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -196 +196 @@
         free(sdu.data);
 
-        async_answer_0(icall_handle, rc);
+        async_answer_0(iid, rc);
 }
 
 static void inetping_get_srcaddr_srv(inetping_client_t *client,
-    cap_call_handle_t icall_handle, ipc_call_t *icall)
+    ipc_callid_t iid, ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_get_srcaddr_srv()");
 
-        cap_call_handle_t chandle;
+        ipc_callid_t callid;
         size_t size;
 
@@ -210 +210 @@
         inet_addr_t remote;
 
-        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(remote)) {
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        errno_t rc = async_data_write_finalize(chandle, &remote, 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;
+        }
+
+        errno_t rc = async_data_write_finalize(callid, &remote, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -231 +231 @@
         rc = inetping_get_srcaddr(client, &remote, &local);
         if (rc != EOK) {
-                async_answer_0(icall_handle, rc);
-                return;
-        }
-
-        if (!async_data_read_receive(&chandle, &size)) {
-                async_answer_0(chandle, EREFUSED);
-                async_answer_0(icall_handle, EREFUSED);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
                 return;
         }
 
         if (size != sizeof(local)) {
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        rc = async_data_read_finalize(chandle, &local, size);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(callid, &local, size);
         if (rc != EOK)
-                async_answer_0(chandle, rc);
-
-        async_answer_0(icall_handle, rc);
+                async_answer_0(callid, rc);
+
+        async_answer_0(iid, rc);
 }
 
@@ -281 +281 @@
 }
 
-void inetping_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+void inetping_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()");
 
         /* Accept the connection */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(iid, EOK);
 
         inetping_client_t client;
@@ -295 +295 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                ipc_callid_t callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up */
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 }
@@ -306 +306 @@
                 switch (method) {
                 case INETPING_SEND:
-                        inetping_send_srv(&client, chandle, &call);
+                        inetping_send_srv(&client, callid, &call);
                         break;
                 case INETPING_GET_SRCADDR:
-                        inetping_get_srcaddr_srv(&client, chandle, &call);
+                        inetping_get_srcaddr_srv(&client, callid, &call);
                         break;
                 default:
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(callid, EINVAL);
                 }
         }