Changes in uspace/srv/ns/service.c [eed4139:a35b458] in mainline

File:

• uspace/srv/ns/service.c (modified) (6 diffs)

uspace/srv/ns/service.c

@@ -87 +87 @@
 typedef struct {
         link_t link;
-        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 */
+        service_t service;    /**< Service ID */
+        iface_t iface;        /**< Interface ID */
+        ipc_callid_t callid;  /**< Call ID waiting for the connection */
+        sysarg_t arg3;        /**< Third argument */
 } pending_conn_t;
 
@@ -119 +119 @@
                 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,
+                async_forward_fast(pending->callid, exch, pending->iface,
                     pending->arg3, 0, IPC_FF_NONE);
                 async_exchange_end(exch);
@@ -160 +160 @@
 /** Connect client to service.
  *
- * @param service  Service to be connected to.
- * @param iface    Interface to be connected to.
- * @param call     Pointer to call structure.
- * @param chandle  Call handle of the request.
+ * @param service Service to be connected to.
+ * @param iface   Interface to be connected to.
+ * @param call    Pointer to call structure.
+ * @param callid  Call ID of the request.
  *
  * @return Zero on success or a value from @ref errno.h.
@@ -169 +169 @@
  */
 void connect_to_service(service_t service, iface_t iface, ipc_call_t *call,
-    cap_call_handle_t chandle)
+    ipc_callid_t callid)
 {
         sysarg_t arg3 = IPC_GET_ARG3(*call);
@@ -189 +189 @@
                         pending->service = service;
                         pending->iface = iface;
-                        pending->chandle = chandle;
+                        pending->callid = callid;
                         pending->arg3 = arg3;
 
@@ -202 +202 @@
         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(callid, exch, iface, arg3, 0, IPC_FF_NONE);
         async_exchange_end(exch);
         return;
 
 out:
-        async_answer_0(chandle, retval);
+        async_answer_0(callid, retval);
 }