X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fio.c;h=e83f985dafb53ff9f0c021d9f5c01e72d1d25bd1;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=fcb06b41e438ea850d7647807771db98628547b7;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/src/network/io.c b/src/network/io.c index fcb06b41e4..e83f985daf 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -1,12 +1,13 @@ /***************************************************************************** * io.c: network I/O functions ***************************************************************************** - * Copyright (C) 2004-2005 the VideoLAN team + * Copyright (C) 2004-2005, 2007 the VideoLAN team * Copyright © 2005-2006 Rémi Denis-Courmont * $Id$ * * Authors: Laurent Aimar * Rémi Denis-Courmont + * Christophe Mutricy * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,6 +67,20 @@ extern int rootwrap_bind (int family, int socktype, int protocol, const struct sockaddr *addr, size_t alen); +int net_SetupSocket (int fd) +{ +#if defined (WIN32) || defined (UNDER_CE) + ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 }); +#else + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK); +#endif + + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int)); + return 0; +} + + int net_Socket (vlc_object_t *p_this, int family, int socktype, int protocol) { @@ -78,23 +93,12 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype, return -1; } -#if defined (WIN32) || defined (UNDER_CE) - ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 }); -#else - fcntl (fd, F_SETFD, FD_CLOEXEC); - fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK); -#endif - - setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int)); + net_SetupSocket (fd); #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)); @@ -123,7 +127,6 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, memset (&hints, 0, sizeof( hints )); hints.ai_family = family; hints.ai_socktype = socktype; - hints.ai_protocol = protocol; hints.ai_flags = AI_PASSIVE; msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port); @@ -142,7 +145,7 @@ 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, - ptr->ai_protocol); + protocol ?: ptr->ai_protocol); if (fd == -1) { msg_Dbg (p_this, "socket error: %s", net_strerror (net_errno)); @@ -178,7 +181,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, - ptr->ai_protocol, ptr->ai_addr, + protocol ?: ptr->ai_protocol, ptr->ai_addr, ptr->ai_addrlen); if (fd != -1) { @@ -208,6 +211,9 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, 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)", @@ -236,162 +242,90 @@ 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, "A socket has been dropped!"); - net_Close (fdv[i]); - } - - int fd = fdv[0]; - assert (fd != -1); - - if (fdv[1] != -1) - { -#ifdef IPV6_V6ONLY - struct sockaddr_storage addr; - - if ((getsockname (fd, (struct sockaddr *)&addr, - &(socklen_t){ sizeof (addr) }) == 0) - && (addr.ss_family == AF_INET6) - && setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){ 0 }, - sizeof (int))) -#endif - msg_Err (obj, "Lame IP dual-stack: IPv4 connections might fail."); - } - - free (fdv); - return fd; -} - - - -/***************************************************************************** - * __net_Close: - ***************************************************************************** - * Close a network handle - *****************************************************************************/ -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 fdc, const int *fdv, +net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv, const v_socket_t *const *restrict vsv, - uint8_t *restrict p_buf, size_t i_buflen, - int wait_ms, vlc_bool_t waitall ) + uint8_t *restrict p_buf, size_t i_buflen, vlc_bool_t waitall) { size_t i_total = 0; while (i_buflen > 0) { - unsigned i; - ssize_t n; -#ifdef HAVE_POLL - struct pollfd ufd[fdc]; -#else - int maxfd = -1; - fd_set set; -#endif - - int delay_ms = 500; - if ((wait_ms != -1) && (wait_ms < 500)) - delay_ms = wait_ms; - - if (p_this->b_die) + 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; } -#ifdef HAVE_POLL - memset (ufd, 0, sizeof (ufd)); + struct pollfd ufd[fdc]; - for( i = 0; i < fdc; i++ ) + for (unsigned i = 0; i < fdc; i++) { ufd[i].fd = fdv[i]; ufd[i].events = POLLIN; + ufd[i].revents = 0; } - n = poll( ufd, fdc, delay_ms ); -#else - FD_ZERO (&set); - - for( i = 0; i < fdc; i++ ) + switch (poll (ufd, fdc, 500)) { -#if !defined(WIN32) && !defined(UNDER_CE) - if( fdv[i] >= FD_SETSIZE ) - { - /* We don't want to overflow select() fd_set */ - msg_Err( p_this, "select set overflow" ); - return -1; - } -#endif - FD_SET( fdv[i], &set ); - if( fdv[i] > maxfd ) - maxfd = fdv[i]; - } - - n = select( maxfd + 1, &set, NULL, NULL, - (wait_ms == -1) ? NULL - : &(struct timeval){ 0, delay_ms * 1000 } ); -#endif - if( n == -1 ) - goto error; - - assert ((unsigned)n <= fdc); + case -1: + goto error; - if (n == 0) // timeout - continue; + case 0: // timeout + continue; + } - for (i = 0;; i++) + for (unsigned i = 0;; i++) { -#ifdef HAVE_POLL - if ((i_total > 0) && (ufd[i].revents & POLLERR)) - return i_total; // error will be dequeued on next run + assert (i < fdc); /* no events found = bug ! */ - if ((ufd[i].revents & POLLIN) == 0) -#else - if (!FD_ISSET (fdv[i], &set)) + if (ufd[i].revents == 0) continue; + +#ifndef POLLRDHUP /* This is nice but non-portable */ +# define POLLRDHUP 0 #endif + if (i_total > 0) + { + // Errors (-1) and EOF (0) will be returned on next run + if (ufd[i].revents & (POLLERR|POLLNVAL|POLLRDHUP)) + return i_total; + } + else + { + if (ufd[i].revents & POLLRDHUP) + return 0; // EOF, read() would yield 0 + } + fdc = 1; fdv += i; vsv += i; + break; } - if( (*vsv) != NULL ) + ssize_t n; + if (*vsv != NULL) { - n = (*vsv)->pf_recv( (*vsv)->p_sys, p_buf, i_buflen ); + n = (*vsv)->pf_recv ((*vsv)->p_sys, p_buf, i_buflen); } else { -#if defined(WIN32) || defined(UNDER_CE) - n = recv( *fdv, p_buf, i_buflen, 0 ); +#ifdef WIN32 + n = recv (*fdv, p_buf, i_buflen, 0); #else - n = read( *fdv, p_buf, i_buflen ); + n = read (*fdv, 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 */ @@ -402,40 +336,33 @@ net_ReadInner( vlc_object_t *restrict p_this, unsigned fdc, const int *fdv, /* 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)" ); - i_total += i_buflen; - return i_total; + msg_Err (p_this, "Receive error: " + "Increase the mtu size (--mtu option)"); + n = i_buflen; + break; + + default: + goto error; } #else - if( errno == EAGAIN ) /* spurious wake-up (sucks if fdc > 1) */ + /* spurious wake-up or TLS did not yield any actual data */ + if (errno == EAGAIN) continue; -#endif goto error; +#endif } - if (n == 0) // EOF - return i_total; - i_total += n; p_buf += n; i_buflen -= n; - if (!waitall) - return i_total; - - if (wait_ms != -1) - { - wait_ms -= delay_ms; - if (wait_ms == 0) - return i_total; // time's up! - } + if ((n == 0) || !waitall) + break; } return i_total; error: - if( errno != EINTR ) - msg_Err( p_this, "Read error: %s", net_strerror (net_errno) ); + msg_Err (p_this, "Read error: %s", net_strerror (net_errno)); return i_total ? (ssize_t)i_total : -1; } @@ -445,129 +372,90 @@ error: ***************************************************************************** * Read from a network socket * If b_retry is true, then we repeat until we have read the right amount of - * data + * data; in that case, a short count means EOF has been reached. *****************************************************************************/ -int __net_Read( vlc_object_t *restrict p_this, int fd, - const v_socket_t *restrict p_vs, - uint8_t *restrict p_data, int i_data, vlc_bool_t b_retry ) +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 }, - p_data, i_data, -1, b_retry ); -} - - -/***************************************************************************** - * __net_ReadNonBlock: - ***************************************************************************** - * Read from a network socket, non blocking mode (with timeout) - *****************************************************************************/ -int __net_ReadNonBlock( vlc_object_t *restrict p_this, int fd, - const v_socket_t *restrict p_vs, - uint8_t *restrict p_data, int i_data, mtime_t i_wait) -{ - return net_ReadInner (p_this, 1, &(int){ fd }, - &(const v_socket_t *){ p_vs }, - p_data, i_data, i_wait / 1000, VLC_FALSE); + buf, len, b_retry ); } /***************************************************************************** * __net_Select: ***************************************************************************** - * Read from several sockets (with timeout). Takes data from the first socket - * that has some. + * Read from several sockets. Takes data from the first socket that has some. *****************************************************************************/ -int __net_Select( vlc_object_t *restrict p_this, const int *restrict pi_fd, - const v_socket_t *const *restrict pp_vs, - int i_fd, uint8_t *restrict p_data, int i_data, - mtime_t i_wait ) +ssize_t __net_Select( vlc_object_t *restrict p_this, + const int *restrict fds, int nfd, + uint8_t *restrict buf, size_t len ) { - if( pp_vs == NULL ) - { - const v_socket_t *vsv[i_fd]; - memset( vsv, 0, sizeof (vsv) ); + const v_socket_t *vsv[nfd]; + memset( vsv, 0, sizeof (vsv) ); - return net_ReadInner( p_this, i_fd, pi_fd, vsv, p_data, i_data, - i_wait / 1000, VLC_FALSE ); - } - - return net_ReadInner( p_this, i_fd, pi_fd, pp_vs, p_data, i_data, - i_wait / 1000, VLC_FALSE ); + return net_ReadInner( p_this, nfd, fds, vsv, + buf, len, VLC_FALSE ); } /* Write exact amount requested */ -int __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, - const uint8_t *p_data, int i_data ) +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; while( i_data > 0 ) { if( p_this->b_die ) - return i_total; + break; -#ifdef HAVE_POLL struct pollfd ufd[1]; memset (ufd, 0, sizeof (ufd)); ufd[0].fd = fd; ufd[0].events = POLLOUT; int val = poll (ufd, 1, 500); - if ((val > 0) && (ufd[0].revents & POLLERR) && (i_total > 0)) - return i_total; // error will be dequeued separately on next call -#else - fd_set set; - FD_ZERO (&set); - -#if !defined(WIN32) && !defined(UNDER_CE) - if (fd >= FD_SETSIZE) - { - /* We don't want to overflow select() fd_set */ - msg_Err (p_this, "select set overflow"); - return -1; - } -#endif - FD_SET (fd, &set); - - int val = select (fd + 1, NULL, &set, NULL, - &(struct timeval){ 0, 500000 }); -#endif switch (val) { case -1: - if (errno != EINTR) - { - msg_Err (p_this, "Write error: %s", - net_strerror (net_errno)); - return i_total ? (int)i_total : -1; - } + msg_Err (p_this, "Write error: %s", net_strerror (net_errno)); + goto out; case 0: continue; } + if ((ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && (i_total > 0)) + return i_total; // error will be dequeued separately on next call + 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); #endif if (val == -1) - return i_total ? (int)i_total : -1; - if (val == 0) - return i_total; + { + msg_Err (p_this, "Write error: %s", net_strerror (net_errno)); + break; + } p_data += val; i_data -= val; i_total += val; } - return i_total; +out: + if ((i_total > 0) || (i_data == 0)) + return i_total; + + return -1; } char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) @@ -610,8 +498,8 @@ char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) return psz_line; } -int net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, - const char *psz_fmt, ... ) +ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, + const char *psz_fmt, ... ) { int i_ret; va_list args; @@ -622,8 +510,8 @@ int net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, return i_ret; } -int __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, - const char *psz_fmt, va_list args ) +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; @@ -702,3 +590,54 @@ int inet_pton(int af, const char *src, void *dst) 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