Changeset bc03679 in mainline for uspace/lib

Timestamp:

2012-04-25T18:14:25Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

291af81

Parents:

ee3b6150 (diff), b1bd89ea (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 with mainline

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/net/modules.c (deleted)
• c/generic/net/socket_client.c (modified) (4 diffs)
• c/generic/ns.c (modified) (5 diffs)
• c/include/net/modules.h (deleted)
• c/include/ns.h (modified) (1 diff)
• net/tl/socket_core.c (modified) (1 diff)

uspace/lib/c/Makefile

@@ -122 +122 @@
         generic/vfs/canonify.c \
         generic/net/inet.c \
-        generic/net/modules.c \
         generic/net/socket_client.c \
         generic/net/socket_parse.c \

uspace/lib/c/generic/net/socket_client.c

@@ -44 +44 @@
 #include <errno.h>
 #include <task.h>
+#include <ns.h>
 #include <ipc/services.h>
 #include <ipc/socket.h>
-#include <net/modules.h>
 #include <net/in.h>
 #include <net/socket.h>
@@ -284 +284 @@
 {
         if (socket_globals.tcp_sess == NULL) {
-                socket_globals.tcp_sess = bind_service(SERVICE_TCP,
+                socket_globals.tcp_sess = service_bind(SERVICE_TCP,
                     0, 0, SERVICE_TCP, socket_connection);
         }
@@ -301 +301 @@
 {
         if (socket_globals.udp_sess == NULL) {
-                socket_globals.udp_sess = bind_service(SERVICE_UDP,
+                socket_globals.udp_sess = service_bind(SERVICE_UDP,
                     0, 0, SERVICE_UDP, socket_connection);
         }
@@ -378 +378 @@
  * @return              Other error codes as defined for the NET_SOCKET message.
  * @return              Other error codes as defined for the
- *                      bind_service() function.
+ *                      service_bind() function.
  */
 int socket(int domain, int type, int protocol)

uspace/lib/c/generic/ns.c

@@ -37 +37 @@
 #include <async.h>
 #include <macros.h>
+#include <errno.h>
 #include "private/ns.h"
 
@@ -48 +49 @@
 }
 
-async_sess_t *service_connect(exch_mgmt_t mgmt, sysarg_t service, sysarg_t arg2,
+async_sess_t *service_connect(exch_mgmt_t mgmt, services_t service, sysarg_t arg2,
     sysarg_t arg3)
 {
@@ -72 +73 @@
 }
 
-async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, sysarg_t service,
+async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, services_t service,
     sysarg_t arg2, sysarg_t arg3)
 {
@@ -81 +82 @@
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
-
+        
         if (!sess)
                 return NULL;
@@ -91 +92 @@
          */
         async_sess_args_set(sess, arg2, arg3, 0);
+        
+        return sess;
+}
+
+/** Create bidirectional connection with a service
+ *
+ * @param[in] service         Service.
+ * @param[in] arg1            First parameter.
+ * @param[in] arg2            Second parameter.
+ * @param[in] arg3            Third parameter.
+ * @param[in] client_receiver Message receiver.
+ *
+ * @return Session to the service.
+ * @return Other error codes as defined by async_connect_to_me().
+ *
+ */
+async_sess_t *service_bind(services_t service, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, async_client_conn_t client_receiver)
+{
+        /* Connect to the needed service */
+        async_sess_t *sess =
+            service_connect_blocking(EXCHANGE_SERIALIZE, service, 0, 0);
+        if (sess != NULL) {
+                /* Request callback connection */
+                async_exch_t *exch = async_exchange_begin(sess);
+                int rc = async_connect_to_me(exch, arg1, arg2, arg3,
+                    client_receiver, NULL);
+                async_exchange_end(exch);
+                
+                if (rc != EOK) {
+                        async_hangup(sess);
+                        errno = rc;
+                        return NULL;
+                }
+        }
         
         return sess;

uspace/lib/c/include/ns.h

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <ipc/services.h>
 #include <task.h>
 #include <async.h>
 
 extern int service_register(sysarg_t);
-extern async_sess_t *service_connect(exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t);
-extern async_sess_t *service_connect_blocking(exch_mgmt_t, sysarg_t, sysarg_t,
+extern async_sess_t *service_connect(exch_mgmt_t, services_t, sysarg_t, sysarg_t);
+extern async_sess_t *service_connect_blocking(exch_mgmt_t, services_t, sysarg_t,
     sysarg_t);
+extern async_sess_t *service_bind(services_t, sysarg_t, sysarg_t, sysarg_t,
+    async_client_conn_t);
 
 extern int ns_ping(void);

uspace/lib/net/tl/socket_core.c

@@ -39 +39 @@
 #include <net/in.h>
 #include <net/inet.h>
-#include <net/modules.h>
 #include <stdint.h>
 #include <stdlib.h>