X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Ftcp.c;h=778a2d7d51707ce374bee9835bbee3b670e9362d;hb=bb7ae441f98c35ed5248c6cb2946a371d4a82c96;hp=4f9fa36ad9aef186b708963ee219527342b1c25c;hpb=aa8356607732152ca53797cda46d56abf4d6ed73;p=vlc diff --git a/src/network/tcp.c b/src/network/tcp.c index 4f9fa36ad9..778a2d7d51 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -35,12 +35,6 @@ #include #include -#ifdef HAVE_FCNTL_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif @@ -71,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; @@ -90,7 +85,8 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port, return -1; 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 && 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,11 +245,7 @@ next_ai: /* failure */ int net_AcceptSingle (vlc_object_t *obj, int lfd) { - int fd; - do - fd = accept (lfd, NULL, NULL); - while (fd == -1 && errno == EINTR); - + int fd = vlc_accept (lfd, NULL, NULL, true); if (fd == -1) { if (net_errno != EAGAIN && net_errno != EWOULDBLOCK) @@ -266,56 +254,51 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd) } 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); - assert( pi_fd != NULL ); + assert (pi_fd != NULL); - for (;;) - { - unsigned n = 0; - while (pi_fd[n] != -1) - n++; - struct pollfd ufd[n + 1]; + 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 */ + /* 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; - switch (poll (ufd, n, timeout)) + for (;;) + { + while (poll (ufd, n + (evfd != -1), -1) == -1) { - case -1: - if (net_errno == EINTR) - continue; + if (net_errno != EINTR) + { msg_Err (p_this, "poll error: %m"); return -1; - case 0: - errno = ETIMEDOUT; - return -1; - } - - if (ufd[n].revents) - { - errno = EINTR; - break; + } } for (unsigned i = 0; i < n; i++) @@ -336,6 +319,12 @@ 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; } @@ -423,7 +412,7 @@ static int SocksNegotiate( 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; } @@ -461,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; @@ -469,7 +460,7 @@ 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 */ @@ -513,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; }