Changeset 97c7682 in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (4 diffs)

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>
@@ -283 +283 @@
 static async_sess_t *socket_get_tcp_sess(void)
 {
-        if (socket_globals.tcp_sess == NULL) {
-                socket_globals.tcp_sess = bind_service(SERVICE_TCP,
+        if (socket_globals.tcp_sess == NULL)
+                socket_globals.tcp_sess = service_bind(SERVICE_TCP,
                     0, 0, SERVICE_TCP, socket_connection);
-        }
-
+        
         return socket_globals.tcp_sess;
 }
@@ -300 +299 @@
 static async_sess_t *socket_get_udp_sess(void)
 {
-        if (socket_globals.udp_sess == NULL) {
-                socket_globals.udp_sess = bind_service(SERVICE_UDP,
+        if (socket_globals.udp_sess == NULL)
+                socket_globals.udp_sess = service_bind(SERVICE_UDP,
                     0, 0, SERVICE_UDP, socket_connection);
-        }
-
+        
         return socket_globals.udp_sess;
 }
@@ -378 +376 @@
  * @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)