Changes in uspace/lib/c/generic/ns.c [f9b2cb4c:7b616e2] in mainline

File:

• uspace/lib/c/generic/ns.c (modified) (7 diffs)

uspace/lib/c/generic/ns.c

@@ -40 +40 @@
 #include "private/ns.h"
 
+/*
+ * XXX ns does not know about session_ns, so we create an extra session for
+ * actual communicaton
+ */
+static async_sess_t *sess_ns = NULL;
+
 int service_register(service_t service)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
+        sysarg_t retval;
+        ipc_call_t answer;
+        
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return EIO;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        aid_t req = async_send_1(exch, NS_REGISTER, service, &answer);
         int rc = async_connect_to_me(exch, 0, service, 0);
+        
         async_exchange_end(exch);
         
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        async_wait_for(req, &retval);
         return rc;
 }
 
-
 async_sess_t *service_connect(service_t service, iface_t iface, sysarg_t arg3)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
-        if (!exch)
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
                 return NULL;
         
-        async_sess_t *sess =
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (exch == NULL)
+                return NULL;
+        
+        async_sess_t *csess =
             async_connect_me_to_iface(exch, iface, service, arg3);
         async_exchange_end(exch);
         
-        if (!sess)
+        if (csess == NULL)
                 return NULL;
         
@@ -68 +92 @@
          * first argument for non-initial connections.
          */
-        async_sess_args_set(sess, iface, arg3, 0);
+        async_sess_args_set(csess, iface, arg3, 0);
         
-        return sess;
+        return csess;
 }
 
@@ -76 +100 @@
     sysarg_t arg3)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
-        async_sess_t *sess =
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return NULL;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        async_sess_t *csess =
             async_connect_me_to_blocking_iface(exch, iface, service, arg3);
         async_exchange_end(exch);
         
-        if (!sess)
+        if (csess == NULL)
                 return NULL;
         
@@ -89 +117 @@
          * first argument for non-initial connections.
          */
-        async_sess_args_set(sess, iface, arg3, 0);
+        async_sess_args_set(csess, iface, arg3, 0);
         
-        return sess;
+        return csess;
 }
 
@@ -97 +125 @@
 int ns_ping(void)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return EIO;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
         int rc = async_req_0_0(exch, NS_PING);
         async_exchange_end(exch);
@@ -106 +138 @@
 int ns_intro(task_id_t id)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
+        async_exch_t *exch;
+        async_sess_t *sess = ns_session_get();
+        if (sess == NULL)
+                return EIO;
+        
+        exch = async_exchange_begin(sess);
         int rc = async_req_2_0(exch, NS_ID_INTRO, LOWER32(id), UPPER32(id));
         async_exchange_end(exch);
@@ -113 +150 @@
 }
 
+async_sess_t *ns_session_get(void)
+{
+        async_exch_t *exch;
+        
+        if (sess_ns == NULL) {
+                exch = async_exchange_begin(session_ns);
+                sess_ns = async_connect_me_to_iface(exch, 0, 0, 0);
+                async_exchange_end(exch);
+                if (sess_ns == NULL)
+                        return NULL;
+        }
+        
+        return sess_ns;
+}
+
 /** @}
  */