Changeset 984a9ba in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2018-07-05T09:34:09Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

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

uspace/lib/c/generic/inet.c

@@ -36 +36 @@
 #include <stdlib.h>
 
-static void inet_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
+static void inet_cb_conn(ipc_call_t *icall, void *arg);
 
 static async_sess_t *inet_sess = NULL;
@@ -176 +176 @@
 }
 
-static void inet_ev_recv(cap_call_handle_t icall_handle, ipc_call_t *icall)
+static void inet_ev_recv(ipc_call_t *icall)
 {
         inet_dgram_t dgram;
@@ -183 +183 @@
         dgram.iplink = IPC_GET_ARG2(*icall);
 
-        cap_call_handle_t chandle;
+        ipc_call_t call;
         size_t size;
-        if (!async_data_write_receive(&chandle, &size)) {
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
                 return;
         }
 
         if (size != sizeof(inet_addr_t)) {
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        errno_t rc = async_data_write_finalize(chandle, &dgram.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, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        errno_t rc = async_data_write_finalize(&call, &dgram.src, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
                 return;
         }
 
         if (size != sizeof(inet_addr_t)) {
-                async_answer_0(chandle, EINVAL);
-                async_answer_0(icall_handle, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(chandle, &dgram.dest, size);
-        if (rc != EOK) {
-                async_answer_0(chandle, rc);
-                async_answer_0(icall_handle, rc);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, &dgram.dest, size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
                 return;
         }
@@ -225 +225 @@
         rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
         if (rc != EOK) {
-                async_answer_0(icall_handle, rc);
+                async_answer_0(icall, rc);
                 return;
         }
@@ -231 +231 @@
         rc = inet_ev_ops->recv(&dgram);
         free(dgram.data);
-        async_answer_0(icall_handle, rc);
-}
-
-static void inet_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+        async_answer_0(icall, rc);
+}
+
+static void inet_cb_conn(ipc_call_t *icall, void *arg)
 {
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -247 +247 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case INET_EV_RECV:
-                        inet_ev_recv(chandle, &call);
+                        inet_ev_recv(&call);
                         break;
                 default:
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                 }
         }