Changeset ff381a7 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/locsrv/locsrv.c

@@ -412 +412 @@
 {
         if (server == NULL)
-                return EEXISTS;
+                return EEXIST;
         
         fibril_mutex_lock(&servers_list_mutex);
@@ -467 +467 @@
         }
         
-        /* Set the interface, if any. */
-        service->forward_interface = IPC_GET_ARG1(*icall);
-
         /* Get fqsn */
         char *fqsn;
@@ -514 +511 @@
                 free(service->name);
                 free(service);
-                async_answer_0(iid, EEXISTS);
+                async_answer_0(iid, EEXIST);
                 return;
         }
@@ -702 +699 @@
  *
  */
-static void loc_forward(ipc_callid_t callid, ipc_call_t *call)
+static void loc_forward(ipc_callid_t callid, ipc_call_t *call, void *arg)
 {
         fibril_mutex_lock(&services_list_mutex);
@@ -709 +706 @@
          * 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);
@@ -719 +717 @@
         
         async_exch_t *exch = async_exchange_begin(svc->server->sess);
-        
-        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_forward_fast(callid, exch, iface, svc->id, 0, IPC_FF_NONE);
         async_exchange_end(exch);
         
@@ -959 +951 @@
             loc_namespace_find_id(IPC_GET_ARG1(*icall));
         if (namespace == NULL)
-                async_answer_0(iid, EEXISTS);
+                async_answer_0(iid, EEXIST);
         else
                 async_answer_1(iid, EOK, namespace->refcnt);
@@ -1382 +1374 @@
  *
  */
-static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
@@ -1440 +1432 @@
  *
  */
-static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall)
+static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
@@ -1507 +1499 @@
 }
 
-/** 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);
-        }
-}
-
 /**
  *
@@ -1542 +1511 @@
         }
         
-        /* Set a handler of incomming connections */
-        async_set_client_connection(loc_connection);
-        
-        /* Register location service at naming service */
-        int rc = service_register(SERVICE_LOC);
+        port_id_t port;
+        int rc = async_create_port(INTERFACE_LOC_SUPPLIER,
+            loc_connection_supplier, NULL, &port);
         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();