X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=adbd4602f5f80999a9ac52e668627589ff4dedd9;hb=252c9d11a2dfd168cd9186eeaa880d206d5c97d7;hp=415ee6aade8cfa62cbb26c735aed4e5ee6841b40;hpb=c4c6895899f54a303fdda41db9300484911ea5fd;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index 415ee6aade..adbd4602f5 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -26,17 +26,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include +#include -#ifdef HAVE_FCNTL_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif @@ -48,44 +46,49 @@ #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, - char *psz_socks_user, char *psz_socks_passwd ); +#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_user, char *psz_socks_passwd, + const char *psz_user, const char *psz_passwd, 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 ); +#undef net_Connect /***************************************************************************** - * __net_Connect: + * net_Connect: ***************************************************************************** * Open a network connection. * @return socket handler or -1 on error. *****************************************************************************/ -int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, - int type, int proto ) +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, i_saved_errno = 0; - unsigned u_errstep = 0; + 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; + hints.ai_protocol = proto; - 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, ':' ); @@ -94,9 +97,35 @@ int __net_Connect( 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 { @@ -108,114 +137,76 @@ int __net_Connect( 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; } + int timeout = var_InheritInteger (p_this, "ipv4-timeout"); + if (timeout < 0) + timeout = -1; + for( ptr = res; ptr != NULL; ptr = ptr->ai_next ) { - int fd = net_Socket( p_this, ptr->ai_family, type ?: ptr->ai_socktype, - proto ?: ptr->ai_protocol ); + int fd = net_Socket( p_this, ptr->ai_family, + ptr->ai_socktype, ptr->ai_protocol ); if( fd == -1 ) { - if( u_errstep <= 0 ) - { - u_errstep = 1; - i_saved_errno = net_errno; - } - msg_Dbg( p_this, "socket error: %s", strerror( net_errno ) ); + msg_Dbg( p_this, "socket error: %m" ); continue; } 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 val; - if( net_errno != EINPROGRESS ) + if( net_errno != EINPROGRESS && net_errno != EINTR ) { - if( u_errstep <= 1 ) - { - u_errstep = 2; - i_saved_errno = net_errno; - } - msg_Dbg( p_this, "connect error: %s", strerror( net_errno ) ); + msg_Err( p_this, "connection failed: %m" ); goto next_ai; } - var_Create( p_this, "ipv4-timeout", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_this, "ipv4-timeout", &timeout ); - if( timeout.i_int < 0 ) - { - msg_Err( p_this, "invalid negative value for ipv4-timeout" ); - timeout.i_int = 0; - } - d = div( timeout.i_int, 100 ); + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLOUT }, + { .fd = evfd, .events = POLLIN }, + }; - msg_Dbg( p_this, "connection in progress" ); - for (;;) + 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 ); - free( psz_socks ); - 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_Warn( p_this, "select error: %s", - strerror( net_errno ) ); - goto next_ai; - } - - if( d.quot <= 0 ) - { - msg_Dbg( p_this, "select timed out" ); - if( u_errstep <= 2 ) - { - u_errstep = 3; - i_saved_errno = ETIMEDOUT; - } - 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) { - u_errstep = 4; - i_saved_errno = i_val; - msg_Dbg( p_this, "connect error (via getsockopt): %s", - net_strerror( i_val ) ); + errno = val; + msg_Err (p_this, "connection failed: %m"); goto next_ai; } -#endif } + msg_Dbg( p_this, "connection succeeded (socket = %d)", fd ); i_handle = fd; /* success! */ break; @@ -227,22 +218,18 @@ next_ai: /* failure */ vlc_freeaddrinfo( res ); if( i_handle == -1 ) - { - msg_Err( p_this, "Connection to %s port %d failed: %s", psz_host, - i_port, net_strerror( i_saved_errno ) ); - free( psz_socks ); return -1; - } - if( *psz_socks && *psz_socks != ':' ) + if( psz_socks != NULL ) { - char *psz_user = var_CreateGetString( p_this, "socks-user" ); - char *psz_pwd = var_CreateGetString( p_this, "socks-pwd" ); + /* NOTE: psz_socks already free'd! */ + char *psz_user = var_CreateGetNonEmptyString( p_this, "socks-user" ); + char *psz_pwd = var_CreateGetNonEmptyString( 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; } @@ -250,50 +237,78 @@ next_ai: /* failure */ free( psz_user ); free( psz_pwd ); } - free( psz_socks ); return i_handle; } -/***************************************************************************** - * __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_AcceptSingle (vlc_object_t *obj, int lfd) { - vlc_bool_t b_block = (i_wait < 0); + int fd; - while( !p_this->b_die ) + do { - unsigned n = 0; - while (pi_fd[n] != -1) - n++; - struct pollfd ufd[n]; +#ifdef HAVE_ACCEPT4 + fd = accept4 (lfd, NULL, NULL, SOCK_CLOEXEC); + if (fd == -1 && errno == ENOSYS) +#endif + fd = accept (lfd, NULL, NULL); + } + while (fd == -1 && errno == EINTR); - /* Initialize file descriptor set */ - for (unsigned i = 0; i < n; i++) - { - ufd[i].fd = pi_fd[i]; - ufd[i].events = POLLIN; - ufd[i].revents = 0; - } + if (fd == -1) + { + if (net_errno != EAGAIN && net_errno != EWOULDBLOCK) + msg_Err (obj, "accept failed (from socket %d): %m", lfd); + return -1; + } - switch (poll (ufd, n, b_block ? 500 : i_wait)) - { - case -1: - if (net_errno != EINTR) - { - msg_Err (p_this, "poll error: %s", - net_strerror (net_errno)); - } - return -1; + msg_Dbg (obj, "accepted socket %d (from socket %d)", fd, lfd); + net_SetupSocket (fd); + return fd; +} - case 0: - if (b_block) - continue; + +#undef net_Accept +/** + * Accepts an new connection on a set of listening sockets. + * If there are no pending connections, this function will wait. + * @note If the thread needs to handle events other than incoming connections, + * you need to use poll() and net_AcceptSingle() instead. + * + * @param p_this VLC object for logging and object kill signal + * @param pi_fd listening socket set + * @return -1 on error (may be transient error due to network issues), + * a new socket descriptor on success. + */ +int net_Accept (vlc_object_t *p_this, int *pi_fd) +{ + int evfd = vlc_object_waitpipe (p_this); + + assert (pi_fd != NULL); + + unsigned n = 0; + while (pi_fd[n] != -1) + n++; + struct pollfd ufd[n + 1]; + + /* Initialize file descriptor set */ + for (unsigned i = 0; i <= n; i++) + { + ufd[i].fd = (i < n) ? pi_fd[i] : evfd; + ufd[i].events = POLLIN; + } + ufd[n].revents = 0; + + for (;;) + { + while (poll (ufd, n + (evfd != -1), -1) == -1) + { + if (net_errno != EINTR) + { + msg_Err (p_this, "poll error: %m"); return -1; + } } for (unsigned i = 0; i < n; i++) @@ -302,14 +317,9 @@ int __net_Accept( vlc_object_t *p_this, int pi_fd[], mtime_t i_wait ) continue; int sfd = ufd[i].fd; - int fd = accept (sfd, NULL, NULL); + int fd = net_AcceptSingle (p_this, sfd); if (fd == -1) - { - 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 @@ -317,37 +327,40 @@ int __net_Accept( vlc_object_t *p_this, int pi_fd[], mtime_t i_wait ) */ 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; } - } + if (ufd[n].revents) + { + errno = EINTR; + break; + } + } 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, - char *psz_socks_user, - char *psz_socks_passwd ) + 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 && psz_socks_passwd && - *psz_socks_user && *psz_socks_passwd ) - b_auth = VLC_TRUE; + if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) ) + b_auth = true; buffer[0] = i_socks_version; /* SOCKS version */ if( b_auth ) @@ -366,7 +379,7 @@ static int SocksNegociate( vlc_object_t *p_obj, 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] ); @@ -393,7 +406,7 @@ static int SocksNegociate( vlc_object_t *p_obj, 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] ); @@ -409,7 +422,7 @@ static int SocksNegociate( vlc_object_t *p_obj, msg_Err( p_obj, "socks: unsupported authentication method %x", buffer[0] ); else - msg_Err( p_obj, "socks: authentification needed" ); + msg_Err( p_obj, "socks: authentication needed" ); return VLC_EGENERIC; } @@ -424,7 +437,7 @@ static int SocksNegociate( vlc_object_t *p_obj, static int SocksHandshakeTCP( vlc_object_t *p_obj, int fd, int i_socks_version, - char *psz_socks_user, char *psz_socks_passwd, + const char *psz_user, const char *psz_passwd, const char *psz_host, int i_port ) { uint8_t buffer[128+2*256]; @@ -435,9 +448,9 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, i_socks_version = 5; } - if( i_socks_version == 5 && - SocksNegociate( p_obj, fd, i_socks_version, - psz_socks_user, psz_socks_passwd ) ) + if( i_socks_version == 5 && + SocksNegotiate( p_obj, fd, i_socks_version, + psz_user, psz_passwd ) ) return VLC_EGENERIC; if( i_socks_version == 4 ) @@ -445,8 +458,10 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, struct addrinfo hints, *p_res; /* v4 only support ipv4 */ - memset (&hints, 0, sizeof (hints)); + memset (&hints, 0, sizeof (hints)); hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) ) return VLC_EGENERIC; @@ -461,7 +476,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, 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", @@ -491,7 +506,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, 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", @@ -499,7 +514,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, if( buffer[1] != 0x00 ) { - msg_Err( p_obj, "socks: CONNECT request failed\n" ); + msg_Err( p_obj, "socks: CONNECT request failed" ); return VLC_EGENERIC; } @@ -510,10 +525,10 @@ 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 ) + if( net_Read( p_obj, fd, NULL, buffer, i_len, true ) != i_len ) return VLC_EGENERIC; }