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

Timestamp:

2011-06-22T01:59:39Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

41e2118

Parents:

79506d6 (diff), f1fae414 (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 libposix changes.

File:

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

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

@@ -64 +64 @@
 /** Maximum waiting sockets queue size. */
 #define SOCKET_MAX_ACCEPTED_SIZE        0
-
-/** Default timeout for connections in microseconds. */
-#define SOCKET_CONNECT_TIMEOUT  (1 * 1000 * 1000)
 
 /**
@@ -289 +286 @@
  * @return              The TCP module phone.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 static int socket_get_tcp_phone(void)
 {
         if (socket_globals.tcp_phone < 0) {
-                socket_globals.tcp_phone = bind_service_timeout(SERVICE_TCP,
-                    0, 0, SERVICE_TCP, socket_connection,
-                    SOCKET_CONNECT_TIMEOUT);
+                socket_globals.tcp_phone = bind_service(SERVICE_TCP,
+                    0, 0, SERVICE_TCP, socket_connection);
         }
 
@@ -308 +304 @@
  * @return              The UDP module phone.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 static int socket_get_udp_phone(void)
 {
         if (socket_globals.udp_phone < 0) {
-                socket_globals.udp_phone = bind_service_timeout(SERVICE_UDP,
-                    0, 0, SERVICE_UDP, socket_connection,
-                    SOCKET_CONNECT_TIMEOUT);
+                socket_globals.udp_phone = bind_service(SERVICE_UDP,
+                    0, 0, SERVICE_UDP, socket_connection);
         }
 
@@ -397 +392 @@
  * @return              Other error codes as defined for the NET_SOCKET message.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 int socket(int domain, int type, int protocol)