Changeset 984a9ba in mainline for uspace/srv/ns/service.c

Timestamp:

2018-07-05T09:34:09Z (7 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/srv/ns/service.c (modified) (5 diffs)

uspace/srv/ns/service.c

@@ -89 +89 @@
         service_t service;         /**< Service ID */
         iface_t iface;             /**< Interface ID */
-        cap_call_handle_t chandle; /**< Call handle waiting for the connection */
-        sysarg_t arg3;             /**< Third argument */
+        ipc_call_t call;           /**< Call waiting for the connection */
 } pending_conn_t;
 
@@ -119 +118 @@
                 hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link);
                 async_exch_t *exch = async_exchange_begin(hashed_service->sess);
-                async_forward_fast(pending->chandle, exch, pending->iface,
-                    pending->arg3, 0, IPC_FF_NONE);
+                async_forward_fast(&pending->call, exch, pending->iface,
+                    IPC_GET_ARG3(pending->call), 0, IPC_FF_NONE);
                 async_exchange_end(exch);
 
@@ -163 +162 @@
  * @param iface    Interface to be connected to.
  * @param call     Pointer to call structure.
- * @param chandle  Call handle of the request.
  *
  * @return Zero on success or a value from @ref errno.h.
  *
  */
-void connect_to_service(service_t service, iface_t iface, ipc_call_t *call,
-    cap_call_handle_t chandle)
-{
-        sysarg_t arg3 = IPC_GET_ARG3(*call);
+void connect_to_service(service_t service, iface_t iface, ipc_call_t *call)
+{
         sysarg_t flags = IPC_GET_ARG4(*call);
         errno_t retval;
@@ -189 +185 @@
                         pending->service = service;
                         pending->iface = iface;
-                        pending->chandle = chandle;
-                        pending->arg3 = arg3;
+                        pending->call = *call;
 
                         list_append(&pending->link, &pending_conn);
@@ -202 +197 @@
         hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link);
         async_exch_t *exch = async_exchange_begin(hashed_service->sess);
-        async_forward_fast(chandle, exch, iface, arg3, 0, IPC_FF_NONE);
+        async_forward_fast(call, exch, iface, IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
         async_exchange_end(exch);
         return;
 
 out:
-        async_answer_0(chandle, retval);
+        async_answer_0(call, retval);
 }