X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fio.c;h=8bbb1bca24cbaeae1d2277ec0aa37423953dc61e;hb=6d85ab85a3f785b8eb86f8f98a58725d9c577e4f;hp=50a87d83b76bc667d44b90237ee5eb0cce165de1;hpb=f10b00253da9041d3115c7991eaae9f0447ed342;p=vlc diff --git a/src/network/io.c b/src/network/io.c index 50a87d83b7..8bbb1bca24 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 @@ -26,9 +27,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include +#include +#include +#include + #include #include @@ -42,10 +51,10 @@ # include #endif #ifdef HAVE_POLL -# include +# include #endif -#include "network.h" +#include #ifndef INADDR_ANY # define INADDR_ANY 0x00000000 @@ -54,531 +63,426 @@ # define INADDR_NONE 0xFFFFFFFF #endif -int net_Socket( vlc_object_t *p_this, int i_family, int i_socktype, - int i_protocol ) -{ - int fd, i_val; - - fd = socket( i_family, i_socktype, i_protocol ); - if( fd == -1 ) - { #if defined(WIN32) || defined(UNDER_CE) - if( WSAGetLastError ( ) != WSAEAFNOSUPPORT ) +# undef EAFNOSUPPORT +# 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); + +int net_SetupSocket (int fd) +{ +#if defined (WIN32) || defined (UNDER_CE) + ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 }); #else - if( errno != EAFNOSUPPORT ) + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK); #endif - msg_Warn( p_this, "cannot create socket: %s", - net_strerror(net_errno) ); - return -1; - } -#if defined( WIN32 ) || defined( UNDER_CE ) + 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) +{ + int fd = socket (family, socktype, protocol); + if (fd == -1) { - unsigned long i_dummy = 1; - if( ioctlsocket( fd, FIONBIO, &i_dummy ) != 0 ) - msg_Err( p_this, "cannot set socket to non-blocking mode" ); + if (net_errno != EAFNOSUPPORT) + msg_Err (p_this, "cannot create socket: %m"); + return -1; } -#else - fcntl( fd, F_SETFD, FD_CLOEXEC ); - i_val = fcntl( fd, F_GETFL, 0 ); - fcntl( fd, F_SETFL, ((i_val != -1) ? i_val : 0) | O_NONBLOCK ); -#endif - i_val = 1; - setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, (void *)&i_val, - sizeof( i_val ) ); + 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( i_family == AF_INET6 ) - setsockopt( fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&i_val, - sizeof( i_val ) ); + if (family == AF_INET6) + setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){ 1 }, sizeof (int)); #endif -#if defined( WIN32 ) || defined( UNDER_CE ) +#if defined (WIN32) || defined (UNDER_CE) # ifndef IPV6_PROTECTION_LEVEL +# warning Please update your C library headers. # define IPV6_PROTECTION_LEVEL 23 +# define PROTECTION_LEVEL_UNRESTRICTED 10 # endif - if( i_family == AF_INET6 ) + if (family == AF_INET6) + setsockopt (fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL, + &(int){ PROTECTION_LEVEL_UNRESTRICTED }, sizeof (int)); +#endif + +#ifdef DCCP_SOCKOPT_SERVICE + if (socktype == SOL_DCCP) { - i_val = 30 /*PROTECTION_LEVEL_UNRESTRICTED*/; - setsockopt( fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL, - (const char*)&i_val, sizeof( i_val ) ); + 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; } -/***************************************************************************** - * __net_Close: - ***************************************************************************** - * Close a network handle - *****************************************************************************/ -void net_Close( int fd ) +int *net_Listen (vlc_object_t *p_this, const char *psz_host, + int i_port, int protocol) { -#ifdef UNDER_CE - CloseHandle( (HANDLE)fd ); -#elif defined( WIN32 ) - closesocket( fd ); -#else - close( fd ); + 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 )); + /* 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; -static int -net_ReadInner( vlc_object_t *restrict p_this, unsigned fdc, const int *fdv, - v_socket_t *const *restrict vsv, - uint8_t *restrict buf, size_t buflen, - int wait_ms, vlc_bool_t waitall ) -{ - int total = 0, n; + msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port); - do + int i_val = vlc_getaddrinfo (p_this, psz_host, i_port, &hints, &res); + if (i_val) { - if (buflen == 0) - return total; // output buffer full - - int delay_ms = 500; - if ((wait_ms != -1) && (wait_ms < 500)) - delay_ms = wait_ms; + msg_Err (p_this, "Cannot resolve %s port %d : %s", psz_host, i_port, + vlc_gai_strerror (i_val)); + return NULL; + } -#ifdef HAVE_POLL - struct pollfd ufd[fdc]; - memset (ufd, 0, sizeof (ufd)); + int *sockv = NULL; + unsigned sockc = 0; - for (unsigned i = 0; i < fdc; i++) + for (struct addrinfo *ptr = res; ptr != NULL; ptr = ptr->ai_next) + { + int fd = net_Socket (p_this, ptr->ai_family, socktype, protocol); + if (fd == -1) { - ufd[i].fd = fdv[i]; - ufd[i].events = POLLIN; + msg_Dbg (p_this, "socket error: %m"); + continue; } - if (p_this->b_die) - return total; - - n = poll (ufd, fdc, (wait_ms == -1) ? -1 : delay_ms); - if (n == -1) - goto error; - - assert ((unsigned)n <= fdc); - - for (int i = 0; n > 0; i++) - if (ufd[i].revents) + /* Bind the socket */ +#if defined (WIN32) || defined (UNDER_CE) + /* + * Under Win32 and for multicasting, we bind to INADDR_ANY. + * This is of course a severe bug, since the socket would logically + * receive unicast traffic, and multicast traffic of groups subscribed + * to via other sockets. + */ + if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen) + && (sizeof (struct sockaddr_storage) >= ptr->ai_addrlen)) + { + // This works for IPv4 too - don't worry! + struct sockaddr_in6 dumb = { - fdc = 1; - fdv += i; - vsv += i; - n--; - goto receive; - } -#else - int maxfd = -1; - fd_set set; - FD_ZERO (&set); + .sin6_family = ptr->ai_addr->sa_family, + .sin6_port = ((struct sockaddr_in *)(ptr->ai_addr))->sin_port + }; - for (unsigned i = 0; i < fdc; i++) + bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen); + } + else +#endif + if (bind (fd, ptr->ai_addr, ptr->ai_addrlen)) { + net_Close (fd); #if !defined(WIN32) && !defined(UNDER_CE) - if (fdv[i] >= FD_SETSIZE) + fd = rootwrap_bind (ptr->ai_family, ptr->ai_socktype, + protocol ?: ptr->ai_protocol, ptr->ai_addr, + ptr->ai_addrlen); + if (fd != -1) { - /* We don't want to overflow select() fd_set */ - msg_Err( p_this, "select set overflow" ); - return -1; + msg_Dbg (p_this, "got socket %d from rootwrap", fd); } + else #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 }); - if (n == -1) - goto error; - - for (unsigned i = 0; n > 0; i++) - if (FD_ISSET (fdv[i], &set)) { - fdc = 1; - fdv += i; - vsv += i; - n--; - goto receive; + msg_Err (p_this, "socket bind error (%m)"); + continue; } -#endif - - continue; - -receive: - if ((*vsv) != NULL) - n = (*vsv)->pf_recv ((*vsv)->p_sys, buf, buflen); - else - n = recv (*fdv, buf, buflen, 0); + } - if (n == -1) + if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen)) { -#if defined(WIN32) || defined(UNDER_CE) - switch (WSAGetLastError()) + if (net_Subscribe (p_this, fd, ptr->ai_addr, ptr->ai_addrlen)) { - case WSAEWOULDBLOCK: - /* only happens with vs != NULL (SSL) - not really an error */ - continue; - - case WSAEMSGSIZE: - /* For UDP only */ - /* 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, "recv() failed. " - "Increase the mtu size (--mtu option)" ); - total += buflen; - return total; - } -#else - if( errno == EAGAIN ) /* spurious wake-up (sucks if fdc > 1) */ + net_Close (fd); continue; -#endif - goto error; + } } - total += n; - buf += n; - buflen -= n; + /* Listen */ + 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 (%m)"); + net_Close (fd); + continue; + } + } - if (wait_ms == -1) + int *nsockv = (int *)realloc (sockv, (sockc + 2) * sizeof (int)); + if (nsockv != NULL) { - if (!waitall) - return total; + nsockv[sockc++] = fd; + sockv = nsockv; } else - wait_ms -= delay_ms; + net_Close (fd); } - while (wait_ms); - return total; // timeout + vlc_freeaddrinfo (res); -error: - msg_Err (p_this, "Receive error: %s", net_strerror (net_errno)); - return (total > 0) ? total : -1; + if (sockv != NULL) + sockv[sockc] = -1; + + return sockv; } /***************************************************************************** * __net_Read: ***************************************************************************** - * Read from a network socket - * If b_retry is true, then we repeat until we have read the right amount of - * data + * 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. *****************************************************************************/ -int __net_Read( vlc_object_t *restrict p_this, int fd, - 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 *vs, + uint8_t *restrict p_buf, size_t i_buflen, bool waitall) { - struct timeval timeout; - fd_set fds_r, fds_e; - int i_recv; - int i_total = 0; - int i_ret; - vlc_bool_t b_die = p_this->b_die; + size_t i_total = 0; + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLIN }, + { .fd = vlc_object_waitpipe (p_this), .events = POLLIN }, + }; - while( i_data > 0 ) - { - do - { - if( p_this->b_die != b_die ) - { - return 0; - } + if (ufd[1].fd == -1) + return -1; /* vlc_object_waitpipe() sets errno */ - /* Initialize file descriptor set */ - FD_ZERO( &fds_r ); - FD_SET( fd, &fds_r ); - FD_ZERO( &fds_e ); - FD_SET( fd, &fds_e ); - - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - - } while( (i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout)) == 0 - || ( i_ret < 0 && errno == EINTR ) ); + while (i_buflen > 0) + { + ufd[0].revents = ufd[1].revents = 0; - if( i_ret < 0 ) + if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0) { - msg_Err( p_this, "network select error (%s)", - net_strerror(net_errno) ); - return i_total > 0 ? i_total : -1; + if (errno != EINTR) + goto error; + continue; } - if( ( i_recv = (p_vs != NULL) - ? p_vs->pf_recv( p_vs->p_sys, p_data, i_data ) - : recv( fd, p_data, i_data, 0 ) ) < 0 ) +#ifndef POLLRDHUP /* This is nice but non-portable */ +# define POLLRDHUP 0 +#endif + if (i_total > 0) { -#if defined(WIN32) || defined(UNDER_CE) - if( WSAGetLastError() == WSAEWOULDBLOCK ) - { - /* only happens with p_vs (SSL) - not really an error */ - } - else - /* For udp only */ - /* On win32 recv() will fail if the datagram doesn't fit inside - * the passed buffer, even though the buffer will be filled with - * the first part of the datagram. */ - if( WSAGetLastError() == WSAEMSGSIZE ) + /* 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; + } + else + { + if (ufd[1].revents) { - msg_Err( p_this, "recv() failed. " - "Increase the mtu size (--mtu option)" ); - i_total += i_data; - } - else if( WSAGetLastError() == WSAEINTR ) continue; + assert (p_this->b_die); + msg_Dbg (p_this, "socket %d polling interrupted", fd); +#if defined(WIN32) || defined(UNDER_CE) + WSASetLastError (WSAEINTR); #else - /* EAGAIN only happens with p_vs (TLS) and it's not an error */ - if( errno != EAGAIN ) + errno = EINTR; #endif - msg_Err( p_this, "recv failed: %s", net_strerror(net_errno) ); - return i_total > 0 ? i_total : -1; + goto silent; + } } - else if( i_recv == 0 ) + + assert (ufd[0].revents); + + ssize_t n; + if (vs != NULL) { - /* Connection closed */ - b_retry = VLC_FALSE; + n = vs->pf_recv (vs->p_sys, p_buf, i_buflen); } - - p_data += i_recv; - i_data -= i_recv; - i_total+= i_recv; - if( !b_retry ) + else { - break; +#ifdef WIN32 + n = recv (fd, p_buf, i_buflen, 0); +#else + n = read (fd, p_buf, i_buflen); +#endif } - } - return i_total; -} -/***************************************************************************** - * __net_ReadNonBlock: - ***************************************************************************** - * Read from a network socket, non blocking mode (with timeout) - *****************************************************************************/ -int __net_ReadNonBlock( vlc_object_t *p_this, int fd, v_socket_t *p_vs, - uint8_t *p_data, int i_data, mtime_t i_wait) -{ - struct timeval timeout; - fd_set fds_r, fds_e; - int i_recv; - int i_ret; - - /* Initialize file descriptor set */ - FD_ZERO( &fds_r ); - FD_SET( fd, &fds_r ); - FD_ZERO( &fds_e ); - FD_SET( fd, &fds_e ); - - timeout.tv_sec = 0; - timeout.tv_usec = i_wait; - - i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout); - - if( i_ret < 0 && errno == EINTR ) - { - return 0; - } - else if( i_ret < 0 ) - { - msg_Err( p_this, "network error: %s", net_strerror(net_errno) ); - return -1; - } - else if( i_ret == 0) - { - return 0; - } - else - { -#if !defined(UNDER_CE) - if( fd == 0/*STDIN_FILENO*/ ) i_recv = read( fd, p_data, i_data ); else -#endif - if( ( i_recv = (p_vs != NULL) - ? p_vs->pf_recv( p_vs->p_sys, p_data, i_data ) - : recv( fd, p_data, i_data, 0 ) ) < 0 ) + if (n == -1) { #if defined(WIN32) || defined(UNDER_CE) - /* For udp only */ - /* On win32 recv() will fail if the datagram doesn't fit inside - * the passed buffer, even though the buffer will be filled with - * the first part of the datagram. */ - if( WSAGetLastError() == WSAEMSGSIZE ) + switch (WSAGetLastError ()) { - msg_Err( p_this, "recv() failed. " - "Increase the mtu size (--mtu option)" ); + case WSAEWOULDBLOCK: + /* only happens with vs != NULL (TLS) - not really an error */ + continue; + + case WSAEMSGSIZE: + /* For UDP only */ + /* 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)"); + n = i_buflen; + break; + + default: + goto error; } - else +#else + /* spurious wake-up or TLS did not yield any actual data */ + if (errno == EAGAIN) + continue; + goto error; #endif - msg_Err( p_this, "recv failed: %s", net_strerror(net_errno) ); - return -1; } - return i_recv ? i_recv : -1; /* !i_recv -> connection closed if tcp */ - } + 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 - /* We will never be here */ - return -1; -} + i_total += n; + p_buf += n; + i_buflen -= n; -/***************************************************************************** - * __net_Select: - ***************************************************************************** - * Read from several sockets (with timeout). Takes data from the first socket - * that has some. - *****************************************************************************/ -int __net_Select( vlc_object_t *p_this, int *pi_fd, v_socket_t **pp_vs, - int i_fd, uint8_t *p_data, int i_data, mtime_t i_wait ) -{ - struct timeval timeout; - fd_set fds_r, fds_e; - int i_recv; - int i_ret; - int i; - int i_max_fd = 0; - - /* Initialize file descriptor set */ - FD_ZERO( &fds_r ); - FD_ZERO( &fds_e ); - - for( i = 0 ; i < i_fd ; i++) - { - if( pi_fd[i] > i_max_fd ) i_max_fd = pi_fd[i]; - FD_SET( pi_fd[i], &fds_r ); - FD_SET( pi_fd[i], &fds_e ); + if (!waitall) + break; } - timeout.tv_sec = 0; - timeout.tv_usec = i_wait; - - i_ret = select( i_max_fd + 1, &fds_r, NULL, &fds_e, &timeout ); - - if( i_ret < 0 && errno == EINTR ) - { - return 0; - } - else if( i_ret < 0 ) - { - msg_Err( p_this, "network selection error: %s", net_strerror(net_errno) ); - return -1; - } - else if( i_ret == 0 ) - { - return 0; - } - else - { - for( i = 0 ; i < i_fd ; i++) - { - if( FD_ISSET( pi_fd[i], &fds_r ) ) - { - i_recv = ((pp_vs != NULL) && (pp_vs[i] != NULL)) - ? pp_vs[i]->pf_recv( pp_vs[i]->p_sys, p_data, i_data ) - : recv( pi_fd[i], p_data, i_data, 0 ); - if( i_recv < 0 ) - { -#ifdef WIN32 - /* For udp only */ - /* On win32 recv() will fail if the datagram doesn't - * fit inside the passed buffer, even though the buffer - * will be filled with the first part of the datagram. */ - if( WSAGetLastError() == WSAEMSGSIZE ) - { - msg_Err( p_this, "recv() failed. " - "Increase the mtu size (--mtu option)" ); - } - else msg_Err( p_this, "recv failed (%i)", - WSAGetLastError() ); -#else - msg_Err( p_this, "recv failed (%s)", strerror(errno) ); -#endif - return VLC_EGENERIC; - } - - return i_recv; - } - } - } + return i_total; - /* We will never be here */ +error: + msg_Err (p_this, "Read error: %m"); +silent: return -1; } /* Write exact amount requested */ -int __net_Write( vlc_object_t *p_this, int fd, 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 ) { - struct timeval timeout; - fd_set fds_w, fds_e; - int i_send; - int i_total = 0; - int i_ret; + size_t i_total = 0; + struct pollfd ufd[2] = { + { .fd = fd, .events = POLLOUT }, + { .fd = vlc_object_waitpipe (p_this), .events = POLLIN }, + }; - vlc_bool_t b_die = p_this->b_die; + if (ufd[1].fd == -1) + return -1; while( i_data > 0 ) { - do + ssize_t val; + + ufd[0].revents = ufd[1].revents = 0; + + if (poll (ufd, 1, -1) == -1) { - if( p_this->b_die != b_die ) + if (errno != EINTR) { - return 0; + msg_Err (p_this, "Write error: %m"); + goto error; } + continue; + } - /* Initialize file descriptor set */ - FD_ZERO( &fds_w ); - FD_SET( fd, &fds_w ); - FD_ZERO( &fds_e ); - FD_SET( fd, &fds_e ); - - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - - } while( (i_ret = select(fd + 1, NULL, &fds_w, &fds_e, &timeout)) == 0 - || ( i_ret < 0 && errno == EINTR ) ); - - if( i_ret < 0 ) + if (i_total > 0) { -#if defined(WIN32) || defined(UNDER_CE) - msg_Err( p_this, "network selection error (%d)", WSAGetLastError() ); + /* 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 +#ifdef WIN32 + val = send (fd, p_data, i_data, 0); #else - msg_Err( p_this, "network selection error (%s)", strerror(errno) ); + val = write (fd, p_data, i_data); #endif - return i_total > 0 ? i_total : -1; - } - if( ( i_send = (p_vs != NULL) - ? p_vs->pf_send( p_vs->p_sys, p_data, i_data ) - : send( fd, p_data, i_data, 0 ) ) < 0 ) + if (val == -1) { - /* XXX With udp for example, it will issue a message if the host - * isn't listening */ - /* msg_Err( p_this, "send failed (%s)", strerror(errno) ); */ - return i_total > 0 ? i_total : -1; + msg_Err (p_this, "Write error: %m"); + break; } - p_data += i_send; - i_data -= i_send; - i_total+= i_send; + p_data += val; + i_data -= val; + i_total += val; } - return i_total; + + if ((i_total > 0) || (i_data == 0)) + return i_total; + +error: + return -1; } -char *__net_Gets( vlc_object_t *p_this, int fd, v_socket_t *p_vs ) +char *__net_Gets( vlc_object_t *p_this, int fd, const v_socket_t *p_vs ) { char *psz_line = NULL, *ptr = NULL; size_t i_line = 0, i_max = 0; @@ -593,7 +497,7 @@ char *__net_Gets( vlc_object_t *p_this, int fd, 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 ) { @@ -618,8 +522,8 @@ char *__net_Gets( vlc_object_t *p_this, int fd, v_socket_t *p_vs ) return psz_line; } -int net_Printf( vlc_object_t *p_this, int fd, 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; @@ -630,8 +534,8 @@ int net_Printf( vlc_object_t *p_this, int fd, v_socket_t *p_vs, return i_ret; } -int __net_vaPrintf( vlc_object_t *p_this, int fd, 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; @@ -667,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 ); @@ -710,3 +614,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