/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <errno.h>
+#include <assert.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#if defined (WIN32) || defined (UNDER_CE)
# undef EINPROGRESS
# define EINPROGRESS WSAEWOULDBLOCK
+# undef EWOULDBLOCK
+# define EWOULDBLOCK WSAEWOULDBLOCK
# undef EINTR
# define EINTR WSAEINTR
# undef ETIMEDOUT
# define ETIMEDOUT WSAETIMEDOUT
#endif
-static int SocksNegociate( vlc_object_t *, int fd, int i_socks_version,
+#include "libvlc.h" /* vlc_object_waitpipe */
+
+static int SocksNegotiate( vlc_object_t *, int fd, int i_socks_version,
const char *psz_user, const char *psz_passwd );
static int SocksHandshakeTCP( vlc_object_t *,
int fd, int i_socks_version,
char *psz_socks;
int i_realport, i_val, i_handle = -1;
- if( i_port == 0 )
- i_port = 80; /* historical VLC thing */
+ int evfd = vlc_object_waitpipe (p_this);
+ if (evfd == -1)
+ return -1;
memset( &hints, 0, sizeof( hints ) );
hints.ai_socktype = SOCK_STREAM;
if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) )
{
- socklen_t i_val_size = sizeof( i_val );
- div_t d;
- vlc_value_t timeout;
+ int timeout, val;
- if( net_errno != EINPROGRESS )
+ if( net_errno != EINPROGRESS && net_errno != EINTR )
{
msg_Err( p_this, "connection failed: %m" );
goto next_ai;
}
msg_Dbg( p_this, "connection: %m" );
- var_Create( p_this, "ipv4-timeout",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "ipv4-timeout", &timeout );
- if( timeout.i_int < 0 )
+ timeout = var_CreateGetInteger (p_this, "ipv4-timeout");
+ if (timeout < 0)
{
msg_Err( p_this, "invalid negative value for ipv4-timeout" );
- timeout.i_int = 0;
+ timeout = 0;
}
- d = div( timeout.i_int, 100 );
- for (;;)
+ struct pollfd ufd[2] = {
+ { .fd = fd, .events = POLLOUT },
+ { .fd = evfd, .events = POLLIN },
+ };
+
+ do
+ /* NOTE: timeout screwed up if we catch a signal (EINTR) */
+ val = poll (ufd, sizeof (ufd) / sizeof (ufd[0]), timeout);
+ while ((val == -1) && (net_errno == EINTR));
+
+ switch (val)
{
- struct pollfd ufd = { .fd = fd, .events = POLLOUT };
- int i_ret;
-
- if( p_this->b_die )
- {
- msg_Dbg( p_this, "connection aborted" );
- net_Close( fd );
- vlc_freeaddrinfo( res );
- return -1;
- }
-
- /*
- * We'll wait 0.1 second if nothing happens
- * NOTE:
- * time out will be shortened if we catch a signal (EINTR)
- */
- i_ret = poll (&ufd, 1, (d.quot > 0) ? 100 : d.rem);
- if( i_ret == 1 )
- break;
-
- if( ( i_ret == -1 ) && ( net_errno != EINTR ) )
- {
- msg_Err( p_this, "connection polling error: %m" );
- goto next_ai;
- }
-
- if( d.quot <= 0 )
- {
- msg_Warn( p_this, "connection timed out" );
- goto next_ai;
- }
-
- d.quot--;
+ case -1: /* error */
+ msg_Err (p_this, "connection polling error: %m");
+ goto next_ai;
+
+ case 0: /* timeout */
+ msg_Warn (p_this, "connection timed out");
+ goto next_ai;
+
+ default: /* something happended */
+ if (ufd[1].revents)
+ goto next_ai; /* LibVLC object killed */
}
-#if !defined( SYS_BEOS ) && !defined( UNDER_CE )
- if( getsockopt( fd, SOL_SOCKET, SO_ERROR, (void*)&i_val,
- &i_val_size ) == -1 || i_val != 0 )
+ /* There is NO WAY around checking SO_ERROR.
+ * Don't ifdef it out!!! */
+ if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &val,
+ &(socklen_t){ sizeof (val) }) || val)
{
- errno = i_val;
- msg_Err( p_this, "connection failed: %m" );
+ errno = val;
+ msg_Err (p_this, "connection failed: %m");
goto next_ai;
}
-#endif
}
msg_Dbg( p_this, "connection succeeded (socket = %d)", fd );
int net_AcceptSingle (vlc_object_t *obj, int lfd)
{
- int fd = accept (lfd, NULL, NULL);
+ int fd;
+ do
+ fd = accept (lfd, NULL, NULL);
+ while (fd == -1 && errno == EINTR);
+
if (fd == -1)
{
- if (net_errno != EAGAIN)
+ if (net_errno != EAGAIN && net_errno != EWOULDBLOCK)
msg_Err (obj, "accept failed (from socket %d): %m", lfd);
return -1;
}
msg_Dbg (obj, "accepted socket %d (from socket %d)", fd, lfd);
net_SetupSocket (fd);
- return 0;
+ return fd;
}
int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
{
int timeout = (i_wait < 0) ? -1 : i_wait / 1000;
- int evfd;
+ int evfd = vlc_object_waitpipe (p_this);
assert( pi_fd != NULL );
- vlc_object_lock (p_this);
- evfd = vlc_object_waitpipe (p_this);
-
- while (vlc_object_alive (p_this))
+ for (;;)
{
unsigned n = 0;
while (pi_fd[n] != -1)
ufd[i].events = POLLIN;
ufd[i].revents = 0;
}
+ if (evfd == -1)
+ n--; /* avoid EBADF */
- vlc_object_unlock (p_this);
switch (poll (ufd, n, timeout))
{
case -1:
- if (net_errno != EINTR)
- msg_Err (p_this, "poll error: %m");
+ if (net_errno == EINTR)
+ continue;
+ msg_Err (p_this, "poll error: %m");
+ return -1;
case 0:
- return -1; /* NOTE: p_this already unlocked */
+ errno = ETIMEDOUT;
+ return -1;
}
- vlc_object_lock (p_this);
if (ufd[n].revents)
{
- vlc_object_wait (p_this);
errno = EINTR;
break;
}
*/
memmove (pi_fd + i, pi_fd + i + 1, n - (i + 1));
pi_fd[n - 1] = sfd;
- vlc_object_unlock (p_this);
return fd;
}
}
- vlc_object_unlock (p_this);
return -1;
}
/*****************************************************************************
- * SocksNegociate:
+ * SocksNegotiate:
*****************************************************************************
- * Negociate authentication with a SOCKS server.
+ * Negotiate authentication with a SOCKS server.
*****************************************************************************/
-static int SocksNegociate( vlc_object_t *p_obj,
+static int SocksNegotiate( vlc_object_t *p_obj,
int fd, int i_socks_version,
const char *psz_socks_user,
const char *psz_socks_passwd )
{
uint8_t buffer[128+2*256];
int i_len;
- vlc_bool_t b_auth = VLC_FALSE;
+ bool b_auth = false;
if( i_socks_version != 5 )
return VLC_SUCCESS;
- /* We negociate authentication */
+ /* We negotiate authentication */
if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
- b_auth = VLC_TRUE;
+ b_auth = true;
buffer[0] = i_socks_version; /* SOCKS version */
if( b_auth )
if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
return VLC_EGENERIC;
- if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+ if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
return VLC_EGENERIC;
msg_Dbg( p_obj, "socks: v=%d method=%x", buffer[0], buffer[1] );
if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
return VLC_EGENERIC;
- if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+ if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
return VLC_EGENERIC;
msg_Dbg( p_obj, "socks: v=%d status=%x", buffer[0], buffer[1] );
}
if( i_socks_version == 5 &&
- SocksNegociate( p_obj, fd, i_socks_version,
+ SocksNegotiate( p_obj, fd, i_socks_version,
psz_user, psz_passwd ) )
return VLC_EGENERIC;
if( net_Write( p_obj, fd, NULL, buffer, 9 ) != 9 )
return VLC_EGENERIC;
- if( net_Read( p_obj, fd, NULL, buffer, 8, VLC_TRUE ) != 8 )
+ if( net_Read( p_obj, fd, NULL, buffer, 8, true ) != 8 )
return VLC_EGENERIC;
msg_Dbg( p_obj, "socks: v=%d cd=%d",
return VLC_EGENERIC;
/* Read the header */
- if( net_Read( p_obj, fd, NULL, buffer, 5, VLC_TRUE ) != 5 )
+ if( net_Read( p_obj, fd, NULL, buffer, 5, true ) != 5 )
return VLC_EGENERIC;
msg_Dbg( p_obj, "socks: v=%d rep=%d atyp=%d",
else
return VLC_EGENERIC;
- if( net_Read( p_obj, fd, NULL, buffer, i_len, VLC_TRUE ) != i_len )
+ if( net_Read( p_obj, fd, NULL, buffer, i_len, true ) != i_len )
return VLC_EGENERIC;
}
projects / vlc / blobdiff