Changeset 1a0fb3f8 in mainline for uspace/srv/net/tl

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

Location:

uspace/srv/net/tl

Files:

• icmp/icmp.c (modified) (2 diffs)
• icmp/icmp_common.c (modified) (1 diff)
• tcp/tcp.c (modified) (1 diff)
• udp/udp.c (modified) (1 diff)

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