X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=778a2d7d51707ce374bee9835bbee3b670e9362d;hb=addf17f0887177964c56bd27856f88de3f0e3509;hp=2dbaa64487d2617177c809ff9422da131758b08d;hpb=c4f5530cc3500542dc8c5e08efa54997edf279b9;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index 2dbaa64487..778a2d7d51 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -30,17 +30,11 @@ # include "config.h" #endif -#include +#include #include #include -#ifdef HAVE_FCNTL_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif @@ -52,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, @@ -67,14 +65,15 @@ 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; @@ -85,12 +84,9 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, if (evfd == -1) return -1; - if( i_port == 0 ) - i_port = 80; /* historical VLC thing */ - - memset( &hints, 0, sizeof( hints ) ); - hints.ai_socktype = SOCK_STREAM; + hints.ai_socktype = type; + hints.ai_protocol = proto; psz_socks = var_CreateGetNonEmptyString( p_this, "socks" ); if( psz_socks != NULL ) @@ -147,14 +143,18 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, if( i_val ) { msg_Err( p_this, "cannot resolve %s port %d : %s", psz_realhost, - i_realport, vlc_gai_strerror( i_val ) ); + i_realport, gai_strerror( i_val ) ); 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" ); @@ -163,21 +163,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 ) ) { - int timeout, val; + 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" ); - - 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] = { { .fd = fd, .events = POLLOUT }, @@ -224,7 +216,7 @@ next_ai: /* failure */ continue; } - vlc_freeaddrinfo( res ); + freeaddrinfo( res ); if( i_handle == -1 ) return -1; @@ -253,65 +245,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); + 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 = vlc_object_waitpipe (p_this); - if (evfd == -1) - return -1; + assert (pi_fd != NULL); - assert( pi_fd != NULL ); + unsigned n = 0; + while (pi_fd[n] != -1) + n++; + struct pollfd ufd[n + 1]; - for (;;) + /* 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; - } - if (evfd == -1) - n--; /* avoid EBADF */ - - 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 */ - } + 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) { - errno = EINTR; - break; + if (net_errno != EINTR) + { + msg_Err (p_this, "poll error: %m"); + return -1; + } } for (unsigned i = 0; i < n; i++) @@ -332,32 +319,38 @@ int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait ) pi_fd[n - 1] = 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, 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 ) @@ -376,7 +369,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] ); @@ -403,7 +396,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] ); @@ -419,7 +412,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; } @@ -446,7 +439,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; @@ -457,6 +450,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; @@ -465,13 +460,13 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, SetWBE( &buffer[2], i_port ); /* Port */ memcpy( &buffer[4], /* Address */ &((struct sockaddr_in *)(p_res->ai_addr))->sin_addr, 4 ); - vlc_freeaddrinfo( p_res ); + freeaddrinfo( p_res ); buffer[8] = 0; /* Empty user id */ 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", @@ -501,7 +496,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", @@ -509,7 +504,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; } @@ -523,7 +518,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; }