Changes in uspace/srv/loader/main.c [8c3bc75:228e490] in mainline

File:

• uspace/srv/loader/main.c (modified) (18 diffs)

uspace/srv/loader/main.c

@@ -50 +50 @@
 #include <fcntl.h>
 #include <sys/types.h>
+#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/loader.h>
@@ -94 +95 @@
 
 /** Used to limit number of connections to one. */
-static bool connected = false;
+static bool connected;
 
 static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
@@ -105 +106 @@
         
         if (!async_data_read_receive(&callid, &len)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -114 +115 @@
         
         async_data_read_finalize(callid, &task_id, len);
-        async_answer_0(rid, EOK);
+        ipc_answer_0(rid, EOK);
 }
 
@@ -134 +135 @@
         }
         
-        async_answer_0(rid, rc);
+        ipc_answer_0(rid, rc);
 }
 
@@ -154 +155 @@
         }
         
-        async_answer_0(rid, rc);
+        ipc_answer_0(rid, rc);
 }
 
@@ -187 +188 @@
                 if (_argv == NULL) {
                         free(buf);
-                        async_answer_0(rid, ENOMEM);
+                        ipc_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -219 +220 @@
         }
         
-        async_answer_0(rid, rc);
+        ipc_answer_0(rid, rc);
 }
 
@@ -243 +244 @@
                 if (_filv == NULL) {
                         free(buf);
-                        async_answer_0(rid, ENOMEM);
+                        ipc_answer_0(rid, ENOMEM);
                         return;
                 }
@@ -270 +271 @@
         }
         
-        async_answer_0(rid, EOK);
+        ipc_answer_0(rid, EOK);
 }
 
@@ -286 +287 @@
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", pathname);
-                async_answer_0(rid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return 1;
         }
@@ -303 +304 @@
                 /* Statically linked program */
                 is_dyn_linked = false;
-                async_answer_0(rid, EOK);
+                ipc_answer_0(rid, EOK);
                 return 0;
         }
@@ -311 +312 @@
                 DPRINTF("Failed to load interpreter '%s.'\n",
                     prog_info.interp);
-                async_answer_0(rid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return 1;
         }
         
         is_dyn_linked = true;
-        async_answer_0(rid, EOK);
+        ipc_answer_0(rid, EOK);
         
         return 0;
@@ -342 +343 @@
                 DPRINTF("Entry point: %p\n", interp_info.entry);
                 
-                async_answer_0(rid, EOK);
+                ipc_answer_0(rid, EOK);
                 elf_run(&interp_info, &pcb);
         } else {
                 /* Statically linked program */
-                async_answer_0(rid, EOK);
+                ipc_answer_0(rid, EOK);
                 elf_run(&prog_info, &pcb);
         }
@@ -366 +367 @@
         /* Already have a connection? */
         if (connected) {
-                async_answer_0(iid, ELIMIT);
+                ipc_answer_0(iid, ELIMIT);
                 return;
         }
@@ -373 +374 @@
         
         /* Accept the connection */
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
         
         /* Ignore parameters, the connection is already open */
@@ -407 +408 @@
                         /* Not reached */
                 default:
-                        retval = EINVAL;
+                        retval = ENOENT;
                         break;
                 }
-                
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
-                        async_answer_0(callid, retval);
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
+                        DPRINTF("Responding EINVAL to method %d.\n",
+                            IPC_GET_IMETHOD(call));
+                        ipc_answer_0(callid, EINVAL);
+                }
         }
 }
@@ -420 +423 @@
 int main(int argc, char *argv[])
 {
+        sysarg_t phonead;
+        task_id_t id;
+        int rc;
+
+        connected = false;
+
+        /* Introduce this task to the NS (give it our task ID). */
+        id = task_get_id();
+        rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
+        if (rc != EOK)
+                return -1;
+
         /* Set a handler of incomming connections. */
         async_set_client_connection(ldr_connection);
         
-        /* Introduce this task to the NS (give it our task ID). */
-        task_id_t id = task_get_id();
-        int rc = async_req_2_0(PHONE_NS, NS_ID_INTRO, LOWER32(id), UPPER32(id));
-        if (rc != EOK)
-                return -1;
-        
         /* Register at naming service. */
-        if (service_register(SERVICE_LOAD) != EOK)
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0) 
                 return -2;
-        
+
         async_manager();