X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fio.c;h=ef07124f740e2ec781a404c72b0b2f80b1550d03;hb=48e4674acd7f2ad37adef14340269f255f56c3a1;hp=905f605cb8d4c026875481a0f97385e5bd819fef;hpb=2815e99445ba576d06e3688df81db6ae59732b13;p=vlc diff --git a/src/network/io.c b/src/network/io.c index 905f605cb8..ef07124f74 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -32,7 +32,7 @@ # include "config.h" #endif -#include +#include #include #include @@ -74,6 +74,8 @@ # define SOL_DCCP 269 #endif +#include "libvlc.h" /* vlc_object_waitpipe */ + extern int rootwrap_bind (int family, int socktype, int protocol, const struct sockaddr *addr, size_t alen); @@ -94,15 +96,29 @@ int net_SetupSocket (int fd) int net_Socket (vlc_object_t *p_this, int family, int socktype, int protocol) { - int fd = socket (family, socktype, protocol); - if (fd == -1) + int fd; + +#ifdef SOCK_CLOEXEC + fd = socket (family, socktype | SOCK_NONBLOCK | SOCK_CLOEXEC, protocol); + if (fd == -1 && errno == EINVAL) +#endif { - if (net_errno != EAFNOSUPPORT) - msg_Err (p_this, "cannot create socket: %m"); - return -1; + fd = socket (family, socktype, protocol); + if (fd == -1) + { + if (net_errno != EAFNOSUPPORT) + msg_Err (p_this, "cannot create socket: %m"); + return -1; + } +#ifndef WIN32 + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK); +#else + ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 }); +#endif } - net_SetupSocket (fd); + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int)); #ifdef IPV6_V6ONLY /* @@ -125,12 +141,15 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype, #endif #ifdef DCCP_SOCKOPT_SERVICE - char *dccps = var_CreateGetNonEmptyString (p_this, "dccp-service"); - if (dccps != NULL) + if (socktype == SOL_DCCP) { - setsockopt (fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE, dccps, - (strlen (dccps) + 3) & ~3); - free (dccps); + 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 @@ -213,9 +232,9 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, { net_Close (fd); #if !defined(WIN32) && !defined(UNDER_CE) - fd = rootwrap_bind (ptr->ai_family, ptr->ai_socktype, - protocol ?: ptr->ai_protocol, ptr->ai_addr, - ptr->ai_addrlen); + fd = rootwrap_bind (ptr->ai_family, socktype, + protocol ? protocol : ptr->ai_protocol, + ptr->ai_addr, ptr->ai_addrlen); if (fd != -1) { msg_Dbg (p_this, "got socket %d from rootwrap", fd); @@ -276,14 +295,14 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, /***************************************************************************** * __net_Read: ***************************************************************************** - * Reads from a network socket. + * Reads from a network socket. Cancellation point. * 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. *****************************************************************************/ 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, vlc_bool_t waitall) + void *restrict p_buf, size_t i_buflen, bool waitall) { size_t i_total = 0; struct pollfd ufd[2] = { @@ -329,7 +348,7 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, #else errno = EINTR; #endif - goto error; + goto silent; } } @@ -338,7 +357,9 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, ssize_t n; if (vs != NULL) { + int canc = vlc_savecancel (); n = vs->pf_recv (vs->p_sys, p_buf, i_buflen); + vlc_restorecancel (canc); } else { @@ -367,16 +388,19 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, "Increase the mtu size (--mtu option)"); n = i_buflen; break; - - default: - goto error; } #else - /* spurious wake-up or TLS did not yield any actual data */ - if (errno == EAGAIN) - continue; - goto error; + switch (errno) + { + case EAGAIN: /* spurious wakeup or no TLS data */ +#if (EAGAIN != EWOULDBLOCK) + case EWOULDBLOCK: +#endif + case EINTR: /* asynchronous signal */ + continue; + } #endif + goto error; } if (n == 0) @@ -389,7 +413,7 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, break; // EOF i_total += n; - p_buf += n; + p_buf = (char *)p_buf + n; i_buflen -= n; if (!waitall) @@ -400,13 +424,14 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, error: msg_Err (p_this, "Read error: %m"); +silent: return -1; } /* Write exact amount requested */ 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 ) + const void *restrict p_data, size_t i_data ) { size_t i_total = 0; struct pollfd ufd[2] = { @@ -423,22 +448,21 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, ufd[0].revents = ufd[1].revents = 0; - if (poll (ufd, 1, -1) == -1) + if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) == -1) { - if (errno != EINTR) - { - msg_Err (p_this, "Write error: %m"); - goto error; - } - continue; + if (errno == EINTR) + continue; + msg_Err (p_this, "Polling error: %m"); + return -1; } if (i_total > 0) - { - /* Errors will be dequeued separately, upon next call. */ - if (ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) + { /* If POLLHUP resp. POLLERR|POLLNVAL occurs while we have already + * read some data, it is important that we first return the number + * of bytes read, and then return 0 resp. -1 on the NEXT call. */ + if (ufd[0].revents & (POLLHUP|POLLERR|POLLNVAL)) break; - if (ufd[1].revents) + if (ufd[1].revents) /* VLC object signaled */ break; } else @@ -462,11 +486,13 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, if (val == -1) { + if (errno == EINTR) + continue; msg_Err (p_this, "Write error: %m"); break; } - p_data += val; + p_data = (const char *)p_data + val; i_data -= val; i_total += val; } @@ -478,6 +504,13 @@ error: return -1; } +/** + * Reads a line from a file descriptor. + * This function is not thread-safe; the same file descriptor cI/O annot be read + * by another thread at the same time (although it can be written to). + * + * @return nul-terminated heap-allocated string, or NULL on I/O error. + */ char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) { char *psz_line = NULL, *ptr = NULL; @@ -489,11 +522,11 @@ char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) if( i_line == i_max ) { i_max += 1024; - psz_line = realloc( psz_line, i_max ); + psz_line = xrealloc( psz_line, i_max ); 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, ptr, 1, true ) != 1 ) { if( i_line == 0 ) { @@ -534,130 +567,14 @@ ssize_t __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, const char *psz_fmt, va_list args ) { char *psz; - int i_size, i_ret; + int i_ret; - i_size = vasprintf( &psz, psz_fmt, args ); - i_ret = __net_Write( p_this, fd, p_vs, (uint8_t *)psz, i_size ) < i_size + int i_size = vasprintf( &psz, psz_fmt, args ); + if( i_size == -1 ) + return -1; + i_ret = __net_Write( p_this, fd, p_vs, psz, i_size ) < i_size ? -1 : i_size; free( psz ); return i_ret; } - - -/***************************************************************************** - * inet_pton replacement for obsolete and/or crap operating systems - *****************************************************************************/ -#ifndef HAVE_INET_PTON -int inet_pton(int af, const char *src, void *dst) -{ -# ifdef WIN32 - /* As we already know, Microsoft always go its own way, so even if they do - * provide IPv6, they don't provide the API. */ - struct sockaddr_storage addr; - int len = sizeof( addr ); - - /* Damn it, they didn't even put LPCSTR for the firs parameter!!! */ -#ifdef UNICODE - wchar_t *workaround_for_ill_designed_api = - malloc( MAX_PATH * sizeof(wchar_t) ); - mbstowcs( workaround_for_ill_designed_api, src, MAX_PATH ); - workaround_for_ill_designed_api[MAX_PATH-1] = 0; -#else - char *workaround_for_ill_designed_api = strdup( src ); -#endif - - if( !WSAStringToAddress( workaround_for_ill_designed_api, af, NULL, - (LPSOCKADDR)&addr, &len ) ) - { - free( workaround_for_ill_designed_api ); - return -1; - } - free( workaround_for_ill_designed_api ); - - switch( af ) - { - case AF_INET6: - memcpy( dst, &((struct sockaddr_in6 *)&addr)->sin6_addr, 16 ); - break; - - case AF_INET: - memcpy( dst, &((struct sockaddr_in *)&addr)->sin_addr, 4 ); - break; - - default: - WSASetLastError( WSAEAFNOSUPPORT ); - return -1; - } -# else - /* Assume IPv6 is not supported. */ - /* Would be safer and more simpler to use inet_aton() but it is most - * likely not provided either. */ - uint32_t ipv4; - - if( af != AF_INET ) - { - errno = EAFNOSUPPORT; - return -1; - } - - ipv4 = inet_addr( src ); - if( ipv4 == INADDR_NONE ) - return -1; - - memcpy( dst, &ipv4, 4 ); -# endif /* WIN32 */ - return 0; -} -#endif /* HAVE_INET_PTON */ - -#ifndef HAVE_INET_NTOP -#ifdef WIN32 -const char *inet_ntop(int af, const void * src, - char * dst, socklen_t cnt) -{ - switch( af ) - { -#ifdef AF_INET6 - case AF_INET6: - { - struct sockaddr_in6 addr; - 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), - NULL, dst, &cnt) ) - { - dst[cnt] = '\0'; - return dst; - } - errno = WSAGetLastError(); - return NULL; - - } - -#endif - case AF_INET: - { - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr = *((struct in_addr*)src); - if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr, - sizeof(struct sockaddr_in), - NULL, dst, &cnt) ) - { - dst[cnt] = '\0'; - return dst; - } - errno = WSAGetLastError(); - return NULL; - - } - } - errno = EAFNOSUPPORT; - return NULL; -} -#endif -#endif