X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fio.c;h=2c1c80e4679cd6ace4d87397a2cf7bed3ae67869;hb=4a8a7265472108dc4af5131fbfd540fd1e758bbf;hp=65af8f9cd73986a7d8e5bbfe50cedc2a21c95a78;hpb=590701d6b366c7fd7cfa4defb7fd4e5f706a3a50;p=vlc diff --git a/src/network/io.c b/src/network/io.c index 65af8f9cd7..2c1c80e467 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -28,7 +28,11 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include @@ -64,6 +68,14 @@ # define EAFNOSUPPORT WSAEAFNOSUPPORT #endif +#ifdef HAVE_LINUX_DCCP_H +/* TODO: use glibc instead of linux-kernel headers */ +# include +# 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); @@ -114,6 +126,19 @@ 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; } @@ -193,7 +218,7 @@ 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, + fd = rootwrap_bind (ptr->ai_family, socktype, protocol ?: ptr->ai_protocol, ptr->ai_addr, ptr->ai_addrlen); if (fd != -1) @@ -256,45 +281,35 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, /***************************************************************************** * __net_Read: ***************************************************************************** - * Read 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. + * 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[1]; - ufd[0].fd = fd; - ufd[0].events = POLLIN; + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLIN }, + { .fd = vlc_object_waitpipe (p_this), .events = POLLIN }, + }; + if (ufd[1].fd == -1) + return -1; /* vlc_object_waitpipe() sets errno */ while (i_buflen > 0) { - if( ( p_this->b_die ) || ( p_this->p_libvlc->b_die ) ) - { -#if defined(WIN32) || defined(UNDER_CE) - WSASetLastError (WSAEINTR); -#else - errno = EINTR; -#endif - goto error; - } + ufd[0].revents = ufd[1].revents = 0; - ufd[0].revents = 0; - /* TODO: don't use arbitrary timer just for b_die */ - switch (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), 500)) + if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0) { - case -1: + if (errno != EINTR) goto error; - - case 0: // timeout - continue; + continue; } - assert (ufd[0].revents); - #ifndef POLLRDHUP /* This is nice but non-portable */ # define POLLRDHUP 0 #endif @@ -304,13 +319,33 @@ __net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs, * otherwise we'd "hide" the error from the caller, which is a * bad idea™. */ if (ufd[0].revents & (POLLERR|POLLNVAL|POLLRDHUP)) - return i_total; + break; + if (ufd[1].revents) + break; + } + else + { + 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; + } } + assert (ufd[0].revents); + 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 { @@ -339,16 +374,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) @@ -361,49 +399,67 @@ __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) break; } + return i_total; error: msg_Err (p_this, "Read error: %m"); - return i_total ? (ssize_t)i_total : -1; +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] = { + { .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, sizeof (ufd) / sizeof (ufd[0]), -1) == -1) { - case -1: - msg_Err (p_this, "Write error: %m"); - goto out; - - case 0: + if (errno == EINTR) continue; + msg_Err (p_this, "Polling error: %m"); + return -1; } - if ((ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && (i_total > 0)) - return i_total; // error will be dequeued separately on next call + if (i_total > 0) + { /* 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) /* VLC object signaled */ + 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); @@ -416,22 +472,31 @@ 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; } -out: if ((i_total > 0) || (i_data == 0)) return i_total; +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; @@ -447,7 +512,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, ptr, 1, true ) != 1 ) { if( i_line == 0 ) { @@ -488,130 +553,29 @@ 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 + /* vlc_sendmsg, vlc_recvmsg Defined in winsock.c */ +#else /* !WIN32 */ +ssize_t vlc_sendmsg (int s, struct msghdr *hdr, int flags) { -# 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; + return sendmsg (s, hdr, flags); } -#endif /* HAVE_INET_PTON */ -#ifndef HAVE_INET_NTOP -#ifdef WIN32 -const char *inet_ntop(int af, const void * src, - char * dst, socklen_t cnt) +ssize_t vlc_recvmsg (int s, struct msghdr *hdr, int flags) { - 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; + return recvmsg (s, hdr, flags); } -#endif -#endif +#endif /* WIN32 */ +