Commit afe94b1c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove confusing debug message (fixes #3319), fetch timeout once

parent b3e29297
...@@ -146,6 +146,10 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, ...@@ -146,6 +146,10 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
return -1; return -1;
} }
int timeout = var_InheritInteger (p_this, "ipv4-timeout");
if (timeout < 0)
timeout = -1;
for( ptr = res; ptr != NULL; ptr = ptr->ai_next ) for( ptr = res; ptr != NULL; ptr = ptr->ai_next )
{ {
int fd = net_Socket( p_this, ptr->ai_family, int fd = net_Socket( p_this, ptr->ai_family,
...@@ -158,21 +162,13 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, ...@@ -158,21 +162,13 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) ) if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) )
{ {
int timeout, val; int val;
if( net_errno != EINPROGRESS && net_errno != EINTR ) if( net_errno != EINPROGRESS && net_errno != EINTR )
{ {
msg_Err( p_this, "connection failed: %m" ); msg_Err( p_this, "connection failed: %m" );
goto next_ai; goto next_ai;
} }
msg_Dbg( p_this, "connection: %m" );
timeout = var_CreateGetInteger (p_this, "ipv4-timeout");
if (timeout < 0)
{
msg_Err( p_this, "invalid negative value for ipv4-timeout" );
timeout = 0;
}
struct pollfd ufd[2] = { struct pollfd ufd[2] = {
{ .fd = fd, .events = POLLOUT }, { .fd = fd, .events = POLLOUT },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment