Changeset 984a9ba in mainline for uspace/lib/c/generic/inet/udp.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/udp.c (modified) (4 diffs)

uspace/lib/c/generic/inet/udp.c

@@ -41 +41 @@
 #include <stdlib.h>
 
-static void udp_cb_conn(cap_call_handle_t, ipc_call_t *, void *);
+static void udp_cb_conn(ipc_call_t *, void *);
 
 /** Create callback connection from UDP service.
@@ -451 +451 @@
  * callback and discard it.
  *
- * @param udp UDP client
- * @param iid IPC message ID
+ * @param udp   UDP client
  * @param icall IPC message
- */
-static void udp_ev_data(udp_t *udp, cap_call_handle_t icall_handle, ipc_call_t *icall)
+ *
+ */
+static void udp_ev_data(udp_t *udp, ipc_call_t *icall)
 {
         udp_rmsg_t rmsg;
@@ -481 +481 @@
         }
 
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 }
 
 /** UDP service callback connection.
  *
- * @param iid Connect message ID
  * @param icall Connect message
- * @param arg Argument, UDP client
- */
-static void udp_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+ * @param arg   Argument, UDP client
+ *
+ */
+static void udp_cb_conn(ipc_call_t *icall, void *arg)
 {
         udp_t *udp = (udp_t *)arg;
 
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -507 +507 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case UDP_EV_DATA:
-                        udp_ev_data(udp, chandle, &call);
+                        udp_ev_data(udp, &call);
                         break;
                 default:
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                         break;
                 }
         }
+
 out:
         fibril_mutex_lock(&udp->lock);