Changes in uspace/srv/ns/ns.c [a47f522:9cfbf2f] in mainline

File:

• uspace/srv/ns/ns.c (modified) (4 diffs)

uspace/srv/ns/ns.c

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
+#include <ipc/services.h>
+#include <abi/ipc/interfaces.h>
 #include <stdio.h>
 #include <errno.h>
@@ -66 +68 @@
         while (true) {
                 process_pending_conn();
-                process_pending_wait();
                 
                 ipc_call_t call;
@@ -74 +75 @@
                 sysarg_t retval;
                 
+                iface_t iface;
+                service_t service;
+                sysarg_t phone;
+                
                 switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -79 +84 @@
                         break;
                 case IPC_M_CONNECT_TO_ME:
+                        service = IPC_GET_ARG2(call);
+                        phone = IPC_GET_ARG5(call);
+                        
                         /*
                          * Server requests service registration.
                          */
-                        if (service_clonable(IPC_GET_ARG1(call))) {
-                                register_clonable(IPC_GET_ARG1(call),
-                                    IPC_GET_ARG5(call), &call, callid);
+                        if (service_clonable(service)) {
+                                register_clonable(service, phone, &call, callid);
                                 continue;
-                        } else {
-                                retval = register_service(IPC_GET_ARG1(call),
-                                    IPC_GET_ARG5(call), &call);
-                        }
+                        } else
+                                retval = register_service(service, phone, &call);
+                        
                         break;
                 case IPC_M_CONNECT_ME_TO:
+                        iface = IPC_GET_ARG1(call);
+                        service = IPC_GET_ARG2(call);
+                        
                         /*
                          * Client requests to be connected to a service.
                          */
-                        if (service_clonable(IPC_GET_ARG1(call))) {
-                                connect_to_clonable(IPC_GET_ARG1(call),
-                                    &call, callid);
+                        if (service_clonable(service)) {
+                                connect_to_clonable(service, iface, &call, callid);
                                 continue;
                         } else {
-                                connect_to_service(IPC_GET_ARG1(call), &call,
-                                    callid);
+                                connect_to_service(service, iface, &call, callid);
                                 continue;
                         }