Changes in uspace/srv/locsrv/locsrv.c [8a637a4:372df8f] in mainline

File:

• uspace/srv/locsrv/locsrv.c (modified) (12 diffs)

uspace/srv/locsrv/locsrv.c

@@ -412 +412 @@
 {
         if (server == NULL)
-                return EEXIST;
+                return EEXISTS;
         
         fibril_mutex_lock(&servers_list_mutex);
@@ -467 +467 @@
         }
         
+        /* Set the interface, if any. */
+        service->forward_interface = IPC_GET_ARG1(*icall);
+
         /* Get fqsn */
         char *fqsn;
@@ -511 +514 @@
                 free(service->name);
                 free(service);
-                async_answer_0(iid, EEXIST);
+                async_answer_0(iid, EEXISTS);
                 return;
         }
@@ -699 +702 @@
  *
  */
-static void loc_forward(ipc_callid_t callid, ipc_call_t *call, void *arg)
+static void loc_forward(ipc_callid_t callid, ipc_call_t *call)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -706 +709 @@
          * Get ID from request
          */
-        iface_t iface = IPC_GET_ARG1(*call);
         service_id_t id = IPC_GET_ARG2(*call);
         loc_service_t *svc = loc_service_find_id(id);
@@ -717 +719 @@
         
         async_exch_t *exch = async_exchange_begin(svc->server->sess);
-        async_forward_fast(callid, exch, iface, svc->id, 0, IPC_FF_NONE);
+        
+        if (svc->forward_interface == 0)
+                async_forward_fast(callid, exch, svc->id, 0, 0, IPC_FF_NONE);
+        else
+                async_forward_fast(callid, exch, svc->forward_interface,
+                    svc->id, 0, IPC_FF_NONE);
+        
         async_exchange_end(exch);
         
@@ -951 +959 @@
             loc_namespace_find_id(IPC_GET_ARG1(*icall));
         if (namespace == NULL)
-                async_answer_0(iid, EEXIST);
+                async_answer_0(iid, EEXISTS);
         else
                 async_answer_1(iid, EOK, namespace->refcnt);
@@ -1317 +1325 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("disk");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("partition");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("iplink");
         categ_dir_add_cat(&cdir, cat);
@@ -1368 +1382 @@
  *
  */
-static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Accept connection */
@@ -1426 +1440 @@
  *
  */
-static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall)
 {
         /* Accept connection */
@@ -1493 +1507 @@
 }
 
+/** Function for handling connections to location service
+ *
+ */
+static void loc_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        /* Select interface */
+        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        case LOC_PORT_SUPPLIER:
+                loc_connection_supplier(iid, icall);
+                break;
+        case LOC_PORT_CONSUMER:
+                loc_connection_consumer(iid, icall);
+                break;
+        case LOC_CONNECT_TO_SERVICE:
+                /* Connect client to selected service */
+                loc_forward(iid, icall);
+                break;
+        default:
+                /* No such interface */
+                async_answer_0(iid, ENOENT);
+        }
+}
+
 /**
  *
@@ -1505 +1542 @@
         }
         
-        port_id_t port;
-        int rc = async_create_port(INTERFACE_LOC_SUPPLIER,
-            loc_connection_supplier, NULL, &port);
+        /* Set a handler of incomming connections */
+        async_set_client_connection(loc_connection);
+        
+        /* Register location service at naming service */
+        int rc = service_register(SERVICE_LOC);
         if (rc != EOK)
                 return rc;
         
-        rc = async_create_port(INTERFACE_LOC_CONSUMER,
-            loc_connection_consumer, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        /* Set a handler of incomming connections */
-        async_set_fallback_port_handler(loc_forward, NULL);
-        
-        /* Register location service at naming service */
-        rc = service_register(SERVICE_LOC);
-        if (rc != EOK)
-                return rc;
-        
         printf("%s: Accepting connections\n", NAME);
         async_manager();