* modules/misc/network/ipv4.c: new --ipv4-timeout config option that lets you specify...

diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c
index c71615632f2b6d8b10dee7098b37ac17d166cb77..a638eecc323df0bb448dc5b033fbe9a03eb2fe67 100644 (file)
--- a/modules/misc/network/ipv4.c
+++ b/modules/misc/network/ipv4.c
@@ -83,10 +83,18 @@ static int NetOpen( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+#define TIMEOUT_TEXT N_("TCP connection timeout in ms")
+#define TIMEOUT_LONGTEXT N_( \
+    "Allows you to modify the default TCP connection timeout. This " \
+    "value should be set in millisecond units." )
+
 vlc_module_begin();
     set_description( _("IPv4 network abstraction layer") );
     set_capability( "network", 50 );
     set_callbacks( NetOpen, NULL );
+
+    add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
+                 TIMEOUT_LONGTEXT, VLC_TRUE );
 vlc_module_end();
 
 /*****************************************************************************
@@ -499,21 +507,30 @@ static int OpenTCP( vlc_object_t * p_this, network_socket_t * p_socket )
         if( 0 )
 #endif
         {
-            int i_ret;
-            int i_opt;
-            int i_opt_size = sizeof( i_opt );
-            struct timeval  timeout;
-            fd_set          fds;
+            int i_ret, i_opt, i_opt_size = sizeof( i_opt ), i_max_count;
+            struct timeval timeout;
+            vlc_value_t val;
+            fd_set fds;
+
+            if( !var_Type( p_this, "ipv4-timeout" ) )
+            {
+                var_Create( p_this, "ipv4-timeout",
+                            VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+            }
+            var_Get( p_this, "ipv4-timeout", &val );
+            i_max_count = val.i_int * 1000 / 100000 /* timeout.tv_usec */;
 
             msg_Dbg( p_this, "connection in progress" );
             do
             {
-                if( p_this->b_die )
+                if( p_this->b_die || i_max_count <= 0 )
                 {
                     msg_Dbg( p_this, "connection aborted" );
                     goto error;
                 }
 
+                i_max_count--;
+
                 /* Initialize file descriptor set */
                 FD_ZERO( &fds );
                 FD_SET( i_handle, &fds );