Changes in uspace/srv/ns/service.c [d9c8c81:007e6efa] in mainline

File:

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

uspace/srv/ns/service.c

@@ -43 +43 @@
 typedef struct {
         link_t link;
-        ipcarg_t service;        /**< Number of the service. */
-        ipcarg_t phone;          /**< Phone registered with the service. */
-        ipcarg_t in_phone_hash;  /**< Incoming phone hash. */
+        sysarg_t service;        /**< Service ID. */
+        sysarg_t phone;          /**< Phone registered with the service. */
+        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
 } hashed_service_t;
 
@@ -56 +56 @@
  *
  */
-static hash_index_t service_hash(unsigned long *key)
+static hash_index_t service_hash(unsigned long key[])
 {
         assert(key);
-        return (*key % SERVICE_HASH_TABLE_CHAINS);
+        return (key[0] % SERVICE_HASH_TABLE_CHAINS);
 }
 
@@ -86 +86 @@
         
         if (keys == 2)
-                return (key[1] == hs->in_phone_hash);
+                return ((key[0] == hs->service) && (key[1] == hs->in_phone_hash));
         else
                 return (key[0] == hs->service);
@@ -115 +115 @@
 typedef struct {
         link_t link;
-        ipcarg_t service;        /**< Number of the service. */
+        sysarg_t service;        /**< Number of the service. */
         ipc_callid_t callid;     /**< Call ID waiting for the connection */
-        ipcarg_t arg2;           /**< Second argument */
-        ipcarg_t arg3;           /**< Third argument */
+        sysarg_t arg2;           /**< Second argument */
+        sysarg_t arg3;           /**< Third argument */
 } pending_conn_t;
 
@@ -156 +156 @@
                 
                 hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
-                ipcarg_t retval = ipc_forward_fast(pr->callid, hs->phone,
-                    pr->arg2, pr->arg3, 0, IPC_FF_NONE);
-                
-                if (!(pr->callid & IPC_CALLID_NOTIFICATION))
-                        ipc_answer_0(pr->callid, retval);
+                (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
+                    pr->arg3, 0, IPC_FF_NONE);
                 
                 list_remove(cur);
@@ -177 +174 @@
  *
  */
-int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
+int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
 {
         unsigned long keys[3] = {
@@ -198 +195 @@
         hash_table_insert(&service_hash_table, keys, &hs->link);
         
-        return 0;
+        return EOK;
 }
 
@@ -210 +207 @@
  *
  */
-void connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
-{
-        ipcarg_t retval;
+void connect_to_service(sysarg_t service, ipc_call_t *call, ipc_callid_t callid)
+{
+        sysarg_t retval;
         unsigned long keys[3] = {
                 service,
@@ -230 +227 @@
                         }
                         
+                        link_initialize(&pr->link);
                         pr->service = service;
                         pr->callid = callid;
@@ -242 +240 @@
         
         hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
-        retval = ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+        return;
         
 out: