X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=7bfd3a99d5ab575d4816baabd4d13d3b9d0011b3;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=3b2bbf15151118ba0d16ae0a27cf2d28dbcd83cb;hpb=79a527b1e4e6cd18328ac4b8e51f56282aa11851;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index 3b2bbf1515..7bfd3a99d5 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -2,6 +2,7 @@ * tcp.c: ***************************************************************************** * Copyright (C) 2004-2005 the VideoLAN team + * Copyright (C) 2005-2006 Rémi Denis-Courmont * $Id$ * * Authors: Laurent Aimar @@ -25,7 +26,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #include #include @@ -39,8 +39,19 @@ #ifdef HAVE_UNISTD_H # include #endif +#ifdef HAVE_POLL +# include +#endif -#include "network.h" +#include +#if defined (WIN32) || defined (UNDER_CE) +# undef EINPROGRESS +# define EINPROGRESS WSAEWOULDBLOCK +# undef EINTR +# define EINTR WSAEINTR +# undef ETIMEDOUT +# define ETIMEDOUT WSAETIMEDOUT +#endif static int SocksNegociate( vlc_object_t *, int fd, int i_socks_version, char *psz_socks_user, char *psz_socks_passwd ); @@ -50,21 +61,20 @@ static int SocksHandshakeTCP( vlc_object_t *, const char *psz_host, int i_port ); extern int net_Socket( vlc_object_t *p_this, int i_family, int i_socktype, int i_protocol ); -extern int rootwrap_bind (int family, int socktype, int protocol, - const struct sockaddr *addr, size_t alen); /***************************************************************************** - * __net_ConnectTCP: + * __net_Connect: ***************************************************************************** - * Open a TCP connection and return a handle + * Open a network connection. + * @return socket handler or -1 on error. *****************************************************************************/ -int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) +int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, + int type, int proto ) { struct addrinfo hints, *res, *ptr; const char *psz_realhost; char *psz_socks; int i_realport, i_val, i_handle = -1; - vlc_bool_t b_unreach = VLC_FALSE; if( i_port == 0 ) i_port = 80; /* historical VLC thing */ @@ -72,8 +82,8 @@ int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) memset( &hints, 0, sizeof( hints ) ); hints.ai_socktype = SOCK_STREAM; - psz_socks = var_CreateGetString( p_this, "socks" ); - if( *psz_socks && *psz_socks != ':' ) + psz_socks = var_CreateGetNonEmptyString( p_this, "socks" ); + if( psz_socks != NULL ) { char *psz = strchr( psz_socks, ':' ); @@ -82,9 +92,35 @@ int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) psz_realhost = psz_socks; i_realport = ( psz != NULL ) ? atoi( psz ) : 1080; + hints.ai_flags &= ~AI_NUMERICHOST; - msg_Dbg( p_this, "net: connecting to %s port %d for %s port %d", - psz_realhost, i_realport, psz_host, i_port ); + msg_Dbg( p_this, "net: connecting to %s port %d (SOCKS) " + "for %s port %d", psz_realhost, i_realport, + psz_host, i_port ); + + /* We only implement TCP with SOCKS */ + switch( type ) + { + case 0: + type = SOCK_STREAM; + case SOCK_STREAM: + break; + default: + msg_Err( p_this, "Socket type not supported through SOCKS" ); + free( psz_socks ); + return -1; + } + switch( proto ) + { + case 0: + proto = IPPROTO_TCP; + case IPPROTO_TCP: + break; + default: + msg_Err( p_this, "Transport not supported through SOCKS" ); + free( psz_socks ); + return -1; + } } else { @@ -96,53 +132,37 @@ int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) } i_val = vlc_getaddrinfo( p_this, psz_realhost, i_realport, &hints, &res ); + free( psz_socks ); + if( i_val ) { msg_Err( p_this, "cannot resolve %s port %d : %s", psz_realhost, i_realport, vlc_gai_strerror( i_val ) ); - free( psz_socks ); return -1; } - for( ptr = res; (ptr != NULL) && (i_handle == -1); ptr = ptr->ai_next ) + for( ptr = res; ptr != NULL; ptr = ptr->ai_next ) { - int fd; - - fd = net_Socket( p_this, ptr->ai_family, ptr->ai_socktype, - ptr->ai_protocol ); + int fd = net_Socket( p_this, ptr->ai_family, type ?: ptr->ai_socktype, + proto ?: ptr->ai_protocol ); if( fd == -1 ) + { + msg_Dbg( p_this, "socket error: %s", strerror( net_errno ) ); continue; + } if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) ) { socklen_t i_val_size = sizeof( i_val ); div_t d; - struct timeval tv; vlc_value_t timeout; -#if defined( WIN32 ) || defined( UNDER_CE ) - if( WSAGetLastError() != WSAEWOULDBLOCK ) + if( net_errno != EINPROGRESS ) { - if( WSAGetLastError () == WSAENETUNREACH ) - b_unreach = VLC_TRUE; - else - msg_Warn( p_this, "connection to %s port %d failed (%d)", - psz_host, i_port, WSAGetLastError( ) ); - net_Close( fd ); - continue; - } -#else - if( errno != EINPROGRESS ) - { - if( errno == ENETUNREACH ) - b_unreach = VLC_TRUE; - else - msg_Warn( p_this, "connection to %s port %d : %s", psz_host, - i_port, strerror( errno ) ); - net_Close( fd ); - continue; + msg_Err( p_this, "connection failed: %s", + strerror( net_errno ) ); + goto next_ai; } -#endif var_Create( p_this, "ipv4-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); @@ -155,100 +175,78 @@ int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) d = div( timeout.i_int, 100 ); msg_Dbg( p_this, "connection in progress" ); - do + for (;;) { - fd_set fds; + 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 ); - free( psz_socks ); return -1; } - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( fd, &fds ); - - /* We'll wait 0.1 second if nothing happens */ - tv.tv_sec = 0; - tv.tv_usec = (d.quot > 0) ? 100000 : (1000 * d.rem); + /* + * 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; - i_val = select( fd + 1, NULL, &fds, NULL, &tv ); + if( ( i_ret == -1 ) && ( net_errno != EINTR ) ) + { + msg_Err( p_this, "connection polling error: %s", + strerror( net_errno ) ); + goto next_ai; + } if( d.quot <= 0 ) { - msg_Dbg( p_this, "connection timed out" ); - net_Close( fd ); - fd = -1; - break; + msg_Warn( p_this, "connection timed out" ); + goto next_ai; } d.quot--; } - while( ( i_val == 0 ) || ( ( i_val < 0 ) && -#if defined( WIN32 ) || defined( UNDER_CE ) - ( WSAGetLastError() == WSAEWOULDBLOCK ) -#else - ( errno == EINTR ) -#endif - ) ); - - if( fd == -1 ) - continue; /* timeout */ - - if( i_val < 0 ) - { - msg_Warn( p_this, "connection aborted (select failed)" ); - net_Close( fd ); - continue; - } #if !defined( SYS_BEOS ) && !defined( UNDER_CE ) if( getsockopt( fd, SOL_SOCKET, SO_ERROR, (void*)&i_val, &i_val_size ) == -1 || i_val != 0 ) { - if( i_val == ENETUNREACH ) - b_unreach = VLC_TRUE; - else - { -#ifdef WIN32 - msg_Warn( p_this, "connection to %s port %d failed (%d)", - psz_host, i_port, WSAGetLastError( ) ); -#else - msg_Warn( p_this, "connection to %s port %d : %s", psz_host, - i_port, strerror( i_val ) ); -#endif - } - net_Close( fd ); - continue; + msg_Err( p_this, "connection failed: %s", + net_strerror( i_val ) ); + goto next_ai; } #endif } + i_handle = fd; /* success! */ + break; + +next_ai: /* failure */ + net_Close( fd ); + continue; } vlc_freeaddrinfo( res ); if( i_handle == -1 ) - { - if( b_unreach ) - msg_Err( p_this, "Host %s port %d is unreachable", psz_host, - i_port ); return -1; - } - if( *psz_socks && *psz_socks != ':' ) + if( psz_socks != NULL ) { + /* NOTE: psz_socks already free'd! */ char *psz_user = var_CreateGetString( p_this, "socks-user" ); char *psz_pwd = var_CreateGetString( p_this, "socks-pwd" ); if( SocksHandshakeTCP( p_this, i_handle, 5, psz_user, psz_pwd, psz_host, i_port ) ) { - msg_Err( p_this, "failed to use the SOCKS server" ); + msg_Err( p_this, "SOCKS handshake failed" ); net_Close( i_handle ); i_handle = -1; } @@ -256,192 +254,74 @@ int __net_ConnectTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) free( psz_user ); free( psz_pwd ); } - free( psz_socks ); return i_handle; } -/***************************************************************************** - * __net_ListenTCP: - ***************************************************************************** - * Open TCP passive "listening" socket(s) - * This function returns NULL in case of error. - *****************************************************************************/ -int *__net_ListenTCP( vlc_object_t *p_this, const char *psz_host, int i_port ) -{ - struct addrinfo hints, *res, *ptr; - int i_val, *pi_handles, i_size; - - memset( &hints, 0, sizeof( hints ) ); - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_PASSIVE; - - msg_Dbg( p_this, "net: listening to %s port %d", psz_host, i_port ); - - i_val = vlc_getaddrinfo( p_this, psz_host, i_port, &hints, &res ); - if( i_val ) - { - msg_Err( p_this, "cannot resolve %s port %d : %s", psz_host, i_port, - vlc_gai_strerror( i_val ) ); - return NULL; - } - - pi_handles = NULL; - i_size = 1; - - for( ptr = res; ptr != NULL; ptr = ptr->ai_next ) - { - int fd, *newpi; - - fd = net_Socket( p_this, ptr->ai_family, ptr->ai_socktype, - ptr->ai_protocol ); - if( fd == -1 ) - continue; - - /* Bind the socket */ - if( bind( fd, ptr->ai_addr, ptr->ai_addrlen ) ) - { -#if defined(WIN32) || defined(UNDER_CE) - msg_Warn( p_this, "cannot bind socket (%i)", WSAGetLastError( ) ); - net_Close( fd ); - continue; -#else - int saved_errno; - - saved_errno = errno; - net_Close( fd ); - fd = rootwrap_bind( ptr->ai_family, ptr->ai_socktype, - ptr->ai_protocol, ptr->ai_addr, - ptr->ai_addrlen ); - if( fd != -1 ) - { - msg_Dbg( p_this, "got socket %d from rootwrap", fd ); - } - else - { - msg_Warn( p_this, "cannot bind socket (%s)", - strerror( saved_errno ) ); - continue; - } -#endif - } - - /* Listen */ - if( listen( fd, 100 ) == -1 ) - { -#if defined(WIN32) || defined(UNDER_CE) - msg_Err( p_this, "cannot bring socket in listening mode (%i)", - WSAGetLastError()); -#else - msg_Err( p_this, "cannot bring the socket in listening mode (%s)", - strerror( errno ) ); -#endif - net_Close( fd ); - continue; - } - - newpi = (int *)realloc( pi_handles, (++i_size) * sizeof( int ) ); - if( newpi == NULL ) - { - net_Close( fd ); - break; - } - else - { - newpi[i_size - 2] = fd; - pi_handles = newpi; - } - } - - vlc_freeaddrinfo( res ); - - if( pi_handles != NULL ) - pi_handles[i_size - 1] = -1; - return pi_handles; -} - /***************************************************************************** * __net_Accept: ***************************************************************************** * Accept a connection on a set of listening sockets and return it *****************************************************************************/ -int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait ) +int __net_Accept( vlc_object_t *p_this, int pi_fd[], mtime_t i_wait ) { - vlc_bool_t b_die = p_this->b_die, b_block = (i_wait < 0); + vlc_bool_t b_block = (i_wait < 0); - while( p_this->b_die == b_die ) + while( !p_this->b_die ) { - int i_val = -1, *pi, *pi_end; - struct timeval timeout; - fd_set fds_r, fds_e; - - pi = pi_fd; + unsigned n = 0; + while (pi_fd[n] != -1) + n++; + struct pollfd ufd[n]; /* Initialize file descriptor set */ - FD_ZERO( &fds_r ); - FD_ZERO( &fds_e ); - - for( pi = pi_fd; *pi != -1; pi++ ) + for (unsigned i = 0; i < n; i++) { - int i_fd = *pi; - - if( i_fd > i_val ) - i_val = i_fd; - - FD_SET( i_fd, &fds_r ); - FD_SET( i_fd, &fds_e ); + ufd[i].fd = pi_fd[i]; + ufd[i].events = POLLIN; + ufd[i].revents = 0; } - pi_end = pi; - - timeout.tv_sec = 0; - timeout.tv_usec = b_block ? 500000 : i_wait; - i_val = select( i_val + 1, &fds_r, NULL, &fds_e, &timeout ); - if( ( ( i_val < 0 ) && ( errno == EINTR ) ) || i_val == 0 ) + switch (poll (ufd, n, b_block ? 500 : i_wait)) { - if( b_block ) - continue; - else + case -1: + if (net_errno != EINTR) + { + msg_Err (p_this, "poll error: %s", + net_strerror (net_errno)); + } + return -1; + + case 0: + if (b_block) + continue; return -1; - } - else if( i_val < 0 ) - { -#if defined(WIN32) || defined(UNDER_CE) - msg_Err( p_this, "network select error (%i)", WSAGetLastError() ); -#else - msg_Err( p_this, "network select error (%s)", strerror( errno ) ); -#endif - return -1; } - for( pi = pi_fd; *pi != -1; pi++ ) + for (unsigned i = 0; i < n; i++) { - int i_fd = *pi; - - if( !FD_ISSET( i_fd, &fds_r ) && !FD_ISSET( i_fd, &fds_e ) ) + if (ufd[i].revents == 0) continue; - i_val = accept( i_fd, NULL, 0 ); - if( i_val < 0 ) + int sfd = ufd[i].fd; + int fd = accept (sfd, NULL, NULL); + if (fd == -1) { -#if defined(WIN32) || defined(UNDER_CE) - msg_Err( p_this, "accept failed (%i)", WSAGetLastError() ); -#else - msg_Err( p_this, "accept failed (%s)", strerror( errno ) ); -#endif - } - else - { - /* - * This round-robin trick ensures that the first sockets in - * pi_fd won't prevent the last ones from getting accept'ed. - */ - --pi_end; - memmove( pi, pi + 1, pi_end - pi ); - *pi_end = i_fd; - return i_val; + msg_Err (p_this, "accept failed (%s)", + net_strerror (net_errno)); + continue; } + net_SetupSocket (fd); + + /* + * Move listening socket to the end to let the others in the + * set a chance next time. + */ + memmove (pi_fd + i, pi_fd + i + 1, n - (i + 1)); + pi_fd[n - 1] = sfd; + msg_Dbg (p_this, "accepted socket %d (from socket %d)", fd, sfd); + return fd; } } @@ -558,16 +438,17 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, i_socks_version = 5; } - if( i_socks_version == 5 && + if( i_socks_version == 5 && SocksNegociate( p_obj, fd, i_socks_version, psz_socks_user, psz_socks_passwd ) ) return VLC_EGENERIC; if( i_socks_version == 4 ) { - struct addrinfo hints = { 0 }, *p_res; + struct addrinfo hints, *p_res; /* v4 only support ipv4 */ + memset (&hints, 0, sizeof (hints)); hints.ai_family = AF_INET; if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) ) return VLC_EGENERIC; @@ -632,7 +513,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, i_len = buffer[4] + 2; else if( buffer[3] == 0x04 ) i_len = 16-1+2; - else + else return VLC_EGENERIC; if( net_Read( p_obj, fd, NULL, buffer, i_len, VLC_TRUE ) != i_len )