Changeset 2133e02 in mainline for uspace/srv/ns/service.c

Timestamp:

2015-08-18T20:14:05Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1a522e5

Parents:

84dc30c

Message:

canonically reserve the first argument of IPC_M_CONNECT_ME_TO for interface type
naming service: service handle in IPC_M_CONNECT_ME_TO needs to be shifted to the second argument
service connections that use the untyped (fallback) port can only provide one additional argument now

File:

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

uspace/srv/ns/service.c

@@ -39 +39 @@
 #include "service.h"
 #include "ns.h"
-
 
 /** Service hash table item. */
@@ -84 +83 @@
         sysarg_t service;        /**< Number of the service. */
         ipc_callid_t callid;     /**< Call ID waiting for the connection */
-        sysarg_t arg2;           /**< Second argument */
+        sysarg_t iface;          /**< Interface argument */
         sysarg_t arg3;           /**< Third argument */
 } pending_conn_t;
@@ -112 +111 @@
                 
                 hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
-                (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
-                    pr->arg3, 0, IPC_FF_NONE);
+                (void) ipc_forward_fast(pr->callid, hs->phone, pr->iface, pr->arg3, 0,
+                    IPC_FF_NONE);
                 
                 list_remove(&pr->link);
@@ -174 +173 @@
                         pr->service = service;
                         pr->callid = callid;
-                        pr->arg2 = IPC_GET_ARG2(*call);
+                        pr->iface = IPC_GET_ARG1(*call);
                         pr->arg3 = IPC_GET_ARG3(*call);
                         list_append(&pr->link, &pending_conn);
                         return;
                 }
+                
                 retval = ENOENT;
                 goto out;
@@ -184 +184 @@
         
         hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
-        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG1(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
         return;