X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fio.c;h=8bbb1bca24cbaeae1d2277ec0aa37423953dc61e;hb=6d85ab85a3f785b8eb86f8f98a58725d9c577e4f;hp=f6c39a514738ea6b30e2221f028c0b31286ea514;hpb=638023d7e64f3b272a10ab5e6200ff2475e09f49;p=vlc diff --git a/src/network/io.c b/src/network/io.c index f6c39a5147..8bbb1bca24 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -28,6 +28,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include @@ -64,6 +68,12 @@ # define EAFNOSUPPORT WSAEAFNOSUPPORT #endif +#ifdef HAVE_LINUX_DCCP_H +/* TODO: use glibc instead of linux-kernel headers */ +# include +# define SOL_DCCP 269 +#endif + extern int rootwrap_bind (int family, int socktype, int protocol, const struct sockaddr *addr, size_t alen); @@ -88,8 +98,7 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype, if (fd == -1) { if (net_errno != EAFNOSUPPORT) - msg_Err (p_this, "cannot create socket: %s", - net_strerror (net_errno)); + msg_Err (p_this, "cannot create socket: %m"); return -1; } @@ -97,12 +106,8 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype, #ifdef IPV6_V6ONLY /* - * Accepts only IPv6 connections on IPv6 sockets - * (and open an IPv4 socket later as well if needed). - * Only Linux and FreeBSD can map IPv4 connections on IPv6 sockets, - * so this allows for more uniform handling across platforms. Besides, - * it makes sure that IPv4 addresses will be printed as w.x.y.z rather - * than ::ffff:w.x.y.z + * Accepts only IPv6 connections on IPv6 sockets. + * If possible, we should open two sockets, but it is not always possible. */ if (family == AF_INET6) setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){ 1 }, sizeof (int)); @@ -119,18 +124,48 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype, &(int){ PROTECTION_LEVEL_UNRESTRICTED }, sizeof (int)); #endif +#ifdef DCCP_SOCKOPT_SERVICE + if (socktype == SOL_DCCP) + { + char *dccps = var_CreateGetNonEmptyString (p_this, "dccp-service"); + if (dccps != NULL) + { + setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE, dccps, + (strlen (dccps) + 3) & ~3); + free (dccps); + } + } +#endif + return fd; } int *net_Listen (vlc_object_t *p_this, const char *psz_host, - int i_port, int family, int socktype, int protocol) + int i_port, int protocol) { struct addrinfo hints, *res; + int socktype = SOCK_DGRAM; + + switch( protocol ) + { + case IPPROTO_TCP: + socktype = SOCK_STREAM; + break; + case 33: /* DCCP */ +#ifdef __linux__ +# ifndef SOCK_DCCP +# define SOCK_DCCP 6 +# endif + socktype = SOCK_DCCP; +#endif + break; + } memset (&hints, 0, sizeof( hints )); - hints.ai_family = family; - hints.ai_socktype = socktype; + /* Since we use port numbers rather than service names, the socket type + * does not really matter. */ + hints.ai_socktype = SOCK_DGRAM; hints.ai_flags = AI_PASSIVE; msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port); @@ -148,11 +183,10 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, for (struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next) { - int fd = net_Socket (p_this, ptr->ai_family, ptr->ai_socktype, - protocol ?: ptr->ai_protocol); + int fd = net_Socket (p_this, ptr->ai_family, socktype, protocol); if (fd == -1) { - msg_Dbg (p_this, "socket error: %s", net_strerror (net_errno)); + msg_Dbg (p_this, "socket error: %m"); continue; } @@ -180,8 +214,6 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, #endif if (bind (fd, ptr->ai_addr, ptr->ai_addrlen)) { - int saved_errno = net_errno; - net_Close (fd); #if !defined(WIN32) && !defined(UNDER_CE) fd = rootwrap_bind (ptr->ai_family, ptr->ai_socktype, @@ -194,8 +226,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, else #endif { - msg_Err (p_this, "socket bind error (%s)", - net_strerror( saved_errno ) ); + msg_Err (p_this, "socket bind error (%m)"); continue; } } @@ -210,15 +241,17 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, } /* Listen */ - switch (ptr->ai_socktype) + switch (socktype) { case SOCK_STREAM: case SOCK_RDM: case SOCK_SEQPACKET: +#ifdef SOCK_DCCP + case SOCK_DCCP: +#endif if (listen (fd, INT_MAX)) { - msg_Err (p_this, "socket listen error (%s)", - net_strerror (net_errno)); + msg_Err (p_this, "socket listen error (%m)"); net_Close (fd); continue; } @@ -243,124 +276,89 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, } -int net_ListenSingle (vlc_object_t *obj, const char *host, int port, - int family, int socktype, int protocol) -{ - int *fdv = net_Listen (obj, host, port, family, socktype, protocol); - if (fdv == NULL) - return -1; - - for (unsigned i = 1; fdv[i] != -1; i++) - { - msg_Warn (obj, "Multiple sockets opened. Dropping extra ones!"); - net_Close (fdv[i]); - } - - int fd = fdv[0]; - assert (fd != -1); - - free (fdv); - return fd; -} - - - /***************************************************************************** - * __net_Close: + * __net_Read: ***************************************************************************** - * Close a network handle + * Reads from a network socket. + * If waitall is true, then we repeat until we have read the right amount of + * data; in that case, a short count means EOF has been reached or the VLC + * object has been signaled. *****************************************************************************/ -void net_Close (int fd) -{ -#ifdef UNDER_CE - CloseHandle ((HANDLE)fd); -#elif defined (WIN32) - closesocket (fd); -#else - (void)close (fd); -#endif -} - - -static ssize_t net_ReadInner( vlc_object_t *restrict p_this, - unsigned i_fdc, const int *p_fdv, - const v_socket_t *const *restrict pp_vsv, - uint8_t *restrict p_buf, size_t i_buflen, - vlc_bool_t dontwait, vlc_bool_t waitall ) +ssize_t +__net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, + uint8_t *restrict p_buf, size_t i_buflen, bool waitall) { size_t i_total = 0; + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLIN }, + { .fd = vlc_object_waitpipe (p_this), .events = POLLIN }, + }; - while( i_buflen > 0 ) + if (ufd[1].fd == -1) + return -1; /* vlc_object_waitpipe() sets errno */ + + while (i_buflen > 0) { - unsigned int i; - ssize_t n; - struct pollfd ufd[i_fdc]; + ufd[0].revents = ufd[1].revents = 0; - int delay_ms = dontwait ? 0 : 500; - if( p_this->b_die ) + if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0) { -#if defined(WIN32) || defined(UNDER_CE) - WSASetLastError(WSAEINTR); -#else - errno = EINTR; -#endif - goto error; + if (errno != EINTR) + goto error; + continue; } - memset (ufd, 0, sizeof (ufd)); - - for( i = 0; i < i_fdc; i++ ) +#ifndef POLLRDHUP /* This is nice but non-portable */ +# define POLLRDHUP 0 +#endif + if (i_total > 0) { - ufd[i].fd = p_fdv[i]; - ufd[i].events = POLLIN; + /* Errors (-1) and EOF (0) will be returned on next call, + * otherwise we'd "hide" the error from the caller, which is a + * bad idea™. */ + if (ufd[0].revents & (POLLERR|POLLNVAL|POLLRDHUP)) + break; + if (ufd[1].revents) + break; } - - n = poll( ufd, i_fdc, delay_ms ); - if( n == -1 ) - goto error; - - assert ((unsigned)n <= i_fdc); - - if( n == 0 ) // timeout - continue; - - for( i = 0; i < i_fdc; i++ ) + else { - if( i_total > 0 && (ufd[i].revents & POLLERR) ) - return i_total; // error will be dequeued on next run - - if( (ufd[i].revents & POLLIN) == 0 ) - continue; - - /* */ - i_fdc = 1; - p_fdv = &p_fdv[i]; - pp_vsv = &pp_vsv[i]; - break; + if (ufd[1].revents) + { + assert (p_this->b_die); + msg_Dbg (p_this, "socket %d polling interrupted", fd); +#if defined(WIN32) || defined(UNDER_CE) + WSASetLastError (WSAEINTR); +#else + errno = EINTR; +#endif + goto silent; + } } - if( i >= i_fdc ) - continue; - if( (*pp_vsv) != NULL ) + assert (ufd[0].revents); + + ssize_t n; + if (vs != NULL) { - n = (*pp_vsv)->pf_recv( (*pp_vsv)->p_sys, p_buf, i_buflen ); + n = vs->pf_recv (vs->p_sys, p_buf, i_buflen); } else { -#if defined(WIN32) || defined(UNDER_CE) - n = recv( *p_fdv, p_buf, i_buflen, 0 ); +#ifdef WIN32 + n = recv (fd, p_buf, i_buflen, 0); #else - n = read( *p_fdv, p_buf, i_buflen ); + n = read (fd, p_buf, i_buflen); #endif } - if( n == -1 ) + if (n == -1) { #if defined(WIN32) || defined(UNDER_CE) - switch( WSAGetLastError() ) + switch (WSAGetLastError ()) { case WSAEWOULDBLOCK: - /* only happens with vs != NULL (SSL) - not really an error */ + /* only happens with vs != NULL (TLS) - not really an error */ continue; case WSAEMSGSIZE: @@ -368,8 +366,8 @@ static ssize_t net_ReadInner( vlc_object_t *restrict p_this, /* On Win32, recv() fails if the datagram doesn't fit inside * the passed buffer, even though the buffer will be filled * with the first part of the datagram. */ - msg_Err( p_this, "Receive error: " - "Increase the mtu size (--mtu option)" ); + msg_Err (p_this, "Receive error: " + "Increase the mtu size (--mtu option)"); n = i_buflen; break; @@ -377,78 +375,36 @@ static ssize_t net_ReadInner( vlc_object_t *restrict p_this, goto error; } #else - if( errno == EAGAIN ) /* spurious wake-up (sucks if i_fdc > 1) */ + /* spurious wake-up or TLS did not yield any actual data */ + if (errno == EAGAIN) continue; goto error; #endif } - if( n == 0 ) // EOF - break; + if (n == 0) + /* For streams, this means end of file, and there will not be any + * further data ever on the stream. For datagram sockets, this + * means empty datagram, and there could be more data coming. + * However, it makes no sense to set with datagrams in the + * first place. + */ + break; // EOF i_total += n; p_buf += n; i_buflen -= n; - if( dontwait || !waitall ) + if (!waitall) break; } + return i_total; error: - msg_Err( p_this, "Read error: %s", net_strerror( net_errno ) ); - return i_total ? (ssize_t)i_total : -1; -} - - -/***************************************************************************** - * __net_Read: - ***************************************************************************** - * Read from a network socket - * If b_retry is true, then we repeat until we have read the right amount of - * data; in that case, a short count means EOF has been reached. - *****************************************************************************/ -ssize_t __net_Read( vlc_object_t *restrict p_this, int fd, - const v_socket_t *restrict p_vs, - uint8_t *restrict buf, size_t len, vlc_bool_t b_retry ) -{ - return net_ReadInner( p_this, 1, &(int){ fd }, - &(const v_socket_t *){ p_vs }, - buf, len, VLC_FALSE, b_retry ); -} - - -/***************************************************************************** - * __net_ReadNonBlock: - ***************************************************************************** - * Read from a network socket, non blocking mode. - * This function should only be used after a poll() (or select(), but you - * should use poll instead of select()) invocation to avoid busy loops. - *****************************************************************************/ -ssize_t __net_ReadNonBlock( vlc_object_t *restrict p_this, int fd, - const v_socket_t *restrict p_vs, - uint8_t *restrict buf, size_t len ) -{ - return net_ReadInner (p_this, 1, &(int){ fd }, - &(const v_socket_t *){ p_vs }, - buf, len, VLC_TRUE, VLC_FALSE); -} - - -/***************************************************************************** - * __net_Select: - ***************************************************************************** - * Read from several sockets. Takes data from the first socket that has some. - *****************************************************************************/ -ssize_t __net_Select( vlc_object_t *restrict p_this, - const int *restrict fds, int nfd, - uint8_t *restrict buf, size_t len ) -{ - const v_socket_t *vsv[nfd]; - memset( vsv, 0, sizeof (vsv) ); - - return net_ReadInner( p_this, nfd, fds, vsv, - buf, len, VLC_FALSE, VLC_FALSE ); + msg_Err (p_this, "Read error: %m"); +silent: + return -1; } @@ -457,35 +413,52 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, const uint8_t *p_data, size_t i_data ) { size_t i_total = 0; + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLOUT }, + { .fd = vlc_object_waitpipe (p_this), .events = POLLIN }, + }; + + if (ufd[1].fd == -1) + return -1; while( i_data > 0 ) { - if( p_this->b_die ) - break; + ssize_t val; - struct pollfd ufd[1]; - memset (ufd, 0, sizeof (ufd)); - ufd[0].fd = fd; - ufd[0].events = POLLOUT; + ufd[0].revents = ufd[1].revents = 0; - int val = poll (ufd, 1, 500); - switch (val) + if (poll (ufd, 1, -1) == -1) { - case -1: - msg_Err (p_this, "Write error: %s", net_strerror (net_errno)); - goto out; - - case 0: - continue; + if (errno != EINTR) + { + msg_Err (p_this, "Write error: %m"); + goto error; + } + continue; } - if ((ufd[0].revents & POLLERR) && (i_total > 0)) - return i_total; // error will be dequeued separately on next call + if (i_total > 0) + { + /* Errors will be dequeued separately, upon next call. */ + if (ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) + break; + if (ufd[1].revents) + break; + } + else + { + if (ufd[1].revents) + { + assert (p_this->b_die); + errno = EINTR; + goto error; + } + } if (p_vs != NULL) val = p_vs->pf_send (p_vs->p_sys, p_data, i_data); else -#if defined(WIN32) || defined(UNDER_CE) +#ifdef WIN32 val = send (fd, p_data, i_data, 0); #else val = write (fd, p_data, i_data); @@ -493,21 +466,19 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, if (val == -1) { - msg_Err (p_this, "Write error: %s", net_strerror (net_errno)); + msg_Err (p_this, "Write error: %m"); break; } - if (val == 0) - return i_total; p_data += val; i_data -= val; i_total += val; } -out: if ((i_total > 0) || (i_data == 0)) return i_total; +error: return -1; } @@ -526,7 +497,7 @@ char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) ptr = psz_line + i_line; } - if( net_Read( p_this, fd, p_vs, (uint8_t *)ptr, 1, VLC_TRUE ) != 1 ) + if( net_Read( p_this, fd, p_vs, (uint8_t *)ptr, 1, true ) != 1 ) { if( i_line == 0 ) { @@ -600,7 +571,7 @@ int inet_pton(int af, const char *src, void *dst) char *workaround_for_ill_designed_api = strdup( src ); #endif - if( !WSAStringToAddress( workaround_for_ill_designed_api, af, NULL, + if( WSAStringToAddress( workaround_for_ill_designed_api, af, NULL, (LPSOCKADDR)&addr, &len ) ) { free( workaround_for_ill_designed_api ); @@ -658,8 +629,8 @@ const char *inet_ntop(int af, const void * src, memset(&addr, 0, sizeof(addr)); addr.sin6_family = AF_INET6; addr.sin6_addr = *((struct in6_addr*)src); - if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr, - sizeof(struct sockaddr_in6), + if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr, + sizeof(struct sockaddr_in6), NULL, dst, &cnt) ) { dst[cnt] = '\0';