X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=7b1cdfa30135b9b3d16017b524ee4ee7db7a89c0;hb=2275df911220b4ae3525014fc711c7e467fcf69f;hp=2f851555f7dc95dceda14daed68f1d4a900f17bb;hpb=cc227c7270cfc3ba47f988df3cdaf232a41a8f34;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index 2f851555f7..7b1cdfa301 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -26,16 +26,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#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 @@ -47,13 +46,17 @@ #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, @@ -62,25 +65,27 @@ static int SocksHandshakeTCP( vlc_object_t *, 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; - 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_CreateGetNonEmptyString( p_this, "socks" ); if( psz_socks != NULL ) @@ -141,10 +146,14 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, 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 ) { msg_Dbg( p_this, "socket error: %m" ); @@ -153,73 +162,48 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, 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 ) { 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 ) - { - 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 }, + }; + + 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)); - for (;;) + 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 ); @@ -260,66 +244,60 @@ next_ai: /* failure */ int net_AcceptSingle (vlc_object_t *obj, int lfd) { - int fd = accept (lfd, NULL, NULL); + int fd = vlc_accept (lfd, NULL, NULL, true); 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; + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof(int)); + return fd; } -/***************************************************************************** - * __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 ) +#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 timeout = (i_wait < 0) ? -1 : i_wait / 1000; - int evfd; + int evfd = vlc_object_waitpipe (p_this); - assert( pi_fd != NULL ); + assert (pi_fd != NULL); - vlc_object_lock (p_this); - evfd = vlc_object_waitpipe (p_this); + unsigned n = 0; + while (pi_fd[n] != -1) + n++; + struct pollfd ufd[n + 1]; - while (vlc_object_alive (p_this)) + /* Initialize file descriptor set */ + for (unsigned i = 0; i <= n; i++) { - 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[i].revents = 0; - } - - vlc_object_unlock (p_this); - switch (poll (ufd, n, timeout)) - { - case -1: - if (net_errno != EINTR) - msg_Err (p_this, "poll error: %m"); - case 0: - return -1; /* NOTE: p_this already unlocked */ - } - vlc_object_lock (p_this); + ufd[i].fd = (i < n) ? pi_fd[i] : evfd; + ufd[i].events = POLLIN; + } + ufd[n].revents = 0; - if (ufd[n].revents) + for (;;) + { + while (poll (ufd, n + (evfd != -1), -1) == -1) { - vlc_object_wait (p_this); - errno = EINTR; - break; + if (net_errno != EINTR) + { + msg_Err (p_this, "poll error: %m"); + return -1; + } } for (unsigned i = 0; i < n; i++) @@ -338,36 +316,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; - vlc_object_unlock (p_this); return fd; } + + if (ufd[n].revents) + { + errno = EINTR; + break; + } } - 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 ) @@ -386,7 +368,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] ); @@ -413,7 +395,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] ); @@ -429,7 +411,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; } @@ -456,7 +438,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, } 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; @@ -467,6 +449,8 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, /* v4 only support ipv4 */ 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; @@ -481,7 +465,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", @@ -511,7 +495,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", @@ -519,7 +503,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; } @@ -533,7 +517,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, 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; }