Changeset 1a0fb3f8 in mainline for uspace/srv/net/socket/socket_client.c

Timestamp:

2010-01-04T22:47:30Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

ede63e4

Parents:

b648ae4

Message:

+ icmp and libsocket timeouting connecting

File:

• uspace/srv/net/socket/socket_client.c (modified) (6 diffs)

uspace/srv/net/socket/socket_client.c

@@ -71 +71 @@
 #define SOCKET_MAX_ACCEPTED_SIZE                0
 
+/** Default timeout for connections in microseconds.
+ */
+#define SOCKET_CONNECT_TIMEOUT  ( 1 * 1000 * 1000 )
+
 /** Type definition of the socket specific data.
  *  @see socket
@@ -180 +184 @@
  *  Connects to the TCP module if necessary.
  *  @returns The TCP module phone.
+ *  @returns Other error codes as defined for the bind_service_timeout() function.
  */
 static int      socket_get_tcp_phone( void );
@@ -186 +191 @@
  *  Connects to the UDP module if necessary.
  *  @returns The UDP module phone.
+ *  @returns Other error codes as defined for the bind_service_timeout() function.
  */
 static int      socket_get_udp_phone( void );
@@ -262 +268 @@
 static int socket_get_tcp_phone( void ){
         if( socket_globals.tcp_phone < 0 ){
-                socket_globals.tcp_phone = bind_service( SERVICE_TCP, 0, 0, SERVICE_TCP, socket_connection );
+                socket_globals.tcp_phone = bind_service_timeout( SERVICE_TCP, 0, 0, SERVICE_TCP, socket_connection, SOCKET_CONNECT_TIMEOUT );
         }
         return socket_globals.tcp_phone;
@@ -269 +275 @@
 static int socket_get_udp_phone( void ){
         if( socket_globals.udp_phone < 0 ){
-                socket_globals.udp_phone = bind_service( SERVICE_UDP, 0, 0, SERVICE_UDP, socket_connection );
+                socket_globals.udp_phone = bind_service_timeout( SERVICE_UDP, 0, 0, SERVICE_UDP, socket_connection, SOCKET_CONNECT_TIMEOUT );
         }
         return socket_globals.udp_phone;
@@ -426 +432 @@
                         return EPFNOSUPPORT;
         }
+        if( phone < 0 ) return phone;
         // create a new socket structure
         socket = ( socket_ref ) malloc( sizeof( socket_t ));