Changeset 1a0fb3f8 in mainline

Timestamp:

2010-01-04T22:47:30Z (14 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

Location:

uspace/srv/net

Files:

• app/ping/ping.c (modified) (1 diff)
• include/icmp_common.h (modified) (1 diff)
• include/socket.h (modified) (1 diff)
• modules.c (modified) (2 diffs)
• modules.h (modified) (3 diffs)
• socket/socket_client.c (modified) (6 diffs)
• tl/icmp/icmp.c (modified) (2 diffs)
• tl/icmp/icmp_common.c (modified) (1 diff)
• tl/tcp/tcp.c (modified) (1 diff)
• tl/udp/udp.c (modified) (1 diff)

uspace/srv/net/app/ping/ping.c

@@ -236 +236 @@
         }
 
-        icmp_phone = icmp_connect_module( SERVICE_ICMP );
+        icmp_phone = icmp_connect_module( SERVICE_ICMP, ICMP_CONNECT_TIMEOUT );
         if( icmp_phone < 0 ){
                 fprintf( stderr, "ICMP connect error %d\n", icmp_phone );
+                return icmp_phone;
         }
 

uspace/srv/net/include/icmp_common.h

@@ -40 +40 @@
 #include <ipc/services.h>
 
+#include <sys/time.h>
+
+/** Default timeout for incoming connections in microseconds.
+ */
+#define ICMP_CONNECT_TIMEOUT    ( 1 * 1000 * 1000 )
+
 /** Connects to the ICMP module.
  *  @param service The ICMP module service. Ignored parameter.
+ *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
  *  @returns The ICMP module phone on success.
  *  @returns The ICMP socket identifier if called by the bundle module.
+ *  @returns ETIMEOUT if the connection timeouted.
  */
-int     icmp_connect_module( services_t service );
+int     icmp_connect_module( services_t service, suseconds_t timeout );
 
 #endif

uspace/srv/net/include/socket.h

@@ -62 +62 @@
  *  @returns ENOMEM if there is not enough memory left.
  *  @returns Other error codes as defined for the NET_SOCKET message.
+ *  @returns Other error codes as defined for the bind_service_timeout() function.
  */
 int     socket( int domain, int type, int protocol );

uspace/srv/net/modules.c

@@ -41 +41 @@
 #include <ipc/services.h>
 
+#include <sys/time.h>
+
 #include "err.h"
 #include "modules.h"
 
-/** The time between connect requests.
+/** The time between connect requests in microseconds.
  */
-#define MODULE_WAIT_TIME        10000
+#define MODULE_WAIT_TIME        ( 10 * 1000 )
 
 int connect_to_service( services_t need ){
+        return connect_to_service_timeout( need, 0 );
+}
+
+int connect_to_service_timeout( services_t need, suseconds_t timeout ){
         int     phone;
         int     res;
 
-        //TODO timeout version?
-        res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
-        while(( res < 0 ) || ( phone < 0 )){
+        while( true ){
+                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
+                if(( res >= 0 ) && ( phone >= 0 )){
+                        return phone;
+                }
+                if( timeout > 0 ){
+                        timeout -= MODULE_WAIT_TIME;
+                        if( timeout <= 0 ) return ETIMEOUT;
+                }
                 usleep( MODULE_WAIT_TIME );
-                res = async_req_3_5( PHONE_NS, IPC_M_CONNECT_ME_TO, need, 0, 0, NULL, NULL, NULL, NULL, ( ipcarg_t * ) & phone );
         }
-        return phone;
 }
 
 int bind_service( services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver ){
+        return bind_service_timeout( need, arg1, arg2, arg3, client_receiver, 0 );
+}
+
+int bind_service_timeout( services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout ){
         ERROR_DECLARE;
 
@@ -67 +81 @@
         ipcarg_t        phonehash;
 
-        phone = connect_to_service( need );
+        phone = connect_to_service_timeout( need, timeout );
         if( phone >= 0 ){
                 if( ERROR_OCCURRED( ipc_connect_to_me( phone, arg1, arg2, arg3, & phonehash ))){

uspace/srv/net/modules.h

@@ -43 +43 @@
 #include <ipc/services.h>
 
+#include <sys/time.h>
+
 /** Converts the data length between different types.
  *      @param[in] type_from The source type.
@@ -68 +70 @@
 int connect_to_service( services_t need );
 
+/** Connects to the needed module.
+ *  @param[in] need The needed module service.
+ *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
+ *  @returns The phone of the needed service.
+ *  @returns ETIMEOUT if the connection timeouted.
+ */
+int connect_to_service_timeout( services_t need, suseconds_t timeout );
+
 /** Creates bidirectional connection with the needed module service and registers the message receiver.
  *  @param[in] need The needed module service.
@@ -78 +88 @@
  */
 int     bind_service( services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver );
+
+/** Creates bidirectional connection with the needed module service and registers the message receiver.
+ *  @param[in] need The needed module service.
+ *  @param[in] arg1 The first parameter.
+ *  @param[in] arg2 The second parameter.
+ *  @param[in] arg3 The third parameter.
+ *  @param[in] client_receiver The message receiver.
+ *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
+ *  @returns The phone of the needed service.
+ *  @returns ETIMEOUT if the connection timeouted.
+ *  @returns Other error codes as defined for the ipc_connect_to_me() function.
+ */
+int     bind_service_timeout( services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout );
 
 /** Answers the call.

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 ));

uspace/srv/net/tl/icmp/icmp.c

@@ -45 +45 @@
 #include <ipc/services.h>
 
+#include <sys/time.h>
 #include <sys/types.h>
 
@@ -508 +509 @@
 }
 
-int icmp_connect_module( services_t service ){
+int icmp_connect_module( services_t service, suseconds_t timeout ){
         icmp_echo_ref   echo_data;
         icmp_param_t    id;

uspace/srv/net/tl/icmp/icmp_common.c

@@ -45 +45 @@
 #include "icmp_messages.h"
 
-int icmp_connect_module( services_t service ){
+int icmp_connect_module( services_t service, suseconds_t timeout ){
         int     phone;
 
-        phone = connect_to_service( SERVICE_ICMP );
+        phone = connect_to_service_timeout( SERVICE_ICMP, timeout );
         if( phone >= 0 ){
                 async_req_0_0( phone, NET_ICMP_INIT );

uspace/srv/net/tl/tcp/tcp.c

@@ -219 +219 @@
         fibril_rwlock_initialize( & tcp_globals.lock );
         fibril_rwlock_write_lock( & tcp_globals.lock );
-        tcp_globals.icmp_phone = icmp_connect_module( SERVICE_ICMP );
-        if( tcp_globals.icmp_phone < 0 ){
-                return tcp_globals.icmp_phone;
-        }
+        tcp_globals.icmp_phone = icmp_connect_module( SERVICE_ICMP, ICMP_CONNECT_TIMEOUT );
         tcp_globals.ip_phone = ip_bind_service( SERVICE_IP, IPPROTO_TCP, SERVICE_TCP, client_connection, tcp_received_msg );
         if( tcp_globals.ip_phone < 0 ){

uspace/srv/net/tl/udp/udp.c

@@ -198 +198 @@
         fibril_rwlock_initialize( & udp_globals.lock );
         fibril_rwlock_write_lock( & udp_globals.lock );
-        udp_globals.icmp_phone = icmp_connect_module( SERVICE_ICMP );
-        if( udp_globals.icmp_phone < 0 ){
-                return udp_globals.icmp_phone;
-        }
+        udp_globals.icmp_phone = icmp_connect_module( SERVICE_ICMP, ICMP_CONNECT_TIMEOUT );
         udp_globals.ip_phone = ip_bind_service( SERVICE_IP, IPPROTO_UDP, SERVICE_UDP, client_connection, udp_received_msg );
         if( udp_globals.ip_phone < 0 ){