/*****************************************************************************
* 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 <fenrir@videolan.org>
* Rémi Denis-Courmont <rem # videolan.org>
+ * Christophe Mutricy <xtophe at videolan dot org>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+
#include <vlc/vlc.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+
#include <errno.h>
+#include <assert.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#ifdef HAVE_POLL
+# include <poll.h>
+#endif
-#include "network.h"
+#include <vlc_network.h>
#ifndef INADDR_ANY
# define INADDR_ANY 0x00000000
# 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 )
- msg_Warn( p_this, "cannot create socket (%i)",
- WSAGetLastError() );
-#else
- if( errno != EAFNOSUPPORT )
- msg_Warn( p_this, "cannot create socket (%s)",
- strerror( errno ) );
+# undef EAFNOSUPPORT
+# define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
- return -1;
- }
- /* Set to non-blocking */
-#if defined( WIN32 ) || defined( UNDER_CE )
+extern int rootwrap_bind (int family, int socktype, int protocol,
+ const struct sockaddr *addr, size_t alen);
+
+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: %s",
+ net_strerror (net_errno));
+ return -1;
}
-#else
- fcntl( fd, F_SETFD, FD_CLOEXEC );
- if( ( ( i_val = fcntl( fd, F_GETFL, 0 ) ) < 0 ) ||
- ( fcntl( fd, F_SETFL, i_val | O_NONBLOCK ) < 0 ) )
- msg_Err( p_this, "cannot set socket to non-blocking mode (%s)",
- strerror( errno ) );
+#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
- i_val = 1;
- setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, (void *)&i_val,
- sizeof( i_val ) );
+ setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int));
#ifdef IPV6_V6ONLY
/*
* it makes sure that IPv4 addresses will be printed as w.x.y.z rather
* than ::ffff:w.x.y.z
*/
- 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
+
+ return fd;
+}
+
+
+int *net_Listen (vlc_object_t *p_this, const char *psz_host,
+ int i_port, int family, int socktype, int protocol)
+{
+ struct addrinfo hints, *res;
+
+ memset (&hints, 0, sizeof( hints ));
+ hints.ai_family = family;
+ hints.ai_socktype = socktype;
+ hints.ai_flags = AI_PASSIVE;
+
+ msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port);
+
+ int i_val = vlc_getaddrinfo (p_this, psz_host, i_port, &hints, &res);
+ if (i_val)
{
- i_val = 30 /*PROTECTION_LEVEL_UNRESTRICTED*/;
- setsockopt( fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
- (const char*)&i_val, sizeof( i_val ) );
+ msg_Err (p_this, "Cannot resolve %s port %d : %s", psz_host, i_port,
+ vlc_gai_strerror (i_val));
+ return NULL;
}
+
+ int *sockv = NULL;
+ unsigned sockc = 0;
+
+ 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);
+ if (fd == -1)
+ {
+ msg_Dbg (p_this, "socket error: %s", net_strerror (net_errno));
+ continue;
+ }
+
+ /* 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 =
+ {
+ .sin6_family = ptr->ai_addr->sa_family,
+ .sin6_port = ((struct sockaddr_in *)(ptr->ai_addr))->sin_port
+ };
+
+ bind (fd, (struct sockaddr *)&dumb, ptr->ai_addrlen);
+ }
+ else
+#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,
+ protocol ?: ptr->ai_protocol, ptr->ai_addr,
+ ptr->ai_addrlen);
+ if (fd != -1)
+ {
+ msg_Dbg (p_this, "got socket %d from rootwrap", fd);
+ }
+ else
#endif
+ {
+ msg_Err (p_this, "socket bind error (%s)",
+ net_strerror( saved_errno ) );
+ continue;
+ }
+ }
+
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen))
+ {
+ if (net_Subscribe (p_this, fd, ptr->ai_addr, ptr->ai_addrlen))
+ {
+ net_Close (fd);
+ continue;
+ }
+ }
+
+ /* Listen */
+ switch (ptr->ai_socktype)
+ {
+ case SOCK_STREAM:
+ case SOCK_RDM:
+ case SOCK_SEQPACKET:
+ if (listen (fd, INT_MAX))
+ {
+ msg_Err (p_this, "socket listen error (%s)",
+ net_strerror (net_errno));
+ net_Close (fd);
+ continue;
+ }
+ }
+
+ int *nsockv = (int *)realloc (sockv, (sockc + 2) * sizeof (int));
+ if (nsockv != NULL)
+ {
+ nsockv[sockc++] = fd;
+ sockv = nsockv;
+ }
+ else
+ net_Close (fd);
+ }
+
+ vlc_freeaddrinfo (res);
+
+ if (sockv != NULL)
+ sockv[sockc] = -1;
+
+ return sockv;
+}
+
+
+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:
*****************************************************************************
* Close a network handle
*****************************************************************************/
-void net_Close( int fd )
+void net_Close (int fd)
{
#ifdef UNDER_CE
- CloseHandle( (HANDLE)fd );
-#elif defined( WIN32 )
- closesocket( fd );
+ CloseHandle ((HANDLE)fd);
+#elif defined (WIN32)
+ closesocket (fd);
#else
- close( fd );
+ (void)close (fd);
#endif
}
-/*****************************************************************************
- * __net_Read:
- *****************************************************************************
- * Read from a network socket
- * If b_retry is true, then we repeat until we have read the right amount of
- * data
- *****************************************************************************/
-int __net_Read( vlc_object_t *p_this, int fd, v_socket_t *p_vs,
- uint8_t *p_data, int i_data, vlc_bool_t b_retry )
+
+static ssize_t
+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 )
{
- 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;
- while( i_data > 0 )
+ while (i_buflen > 0)
{
- do
+ unsigned i;
+ ssize_t n;
+ struct pollfd ufd[fdc];
+
+ 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 != b_die )
- {
- return 0;
- }
+ errno = EINTR;
+ goto error;
+ }
+
+ memset (ufd, 0, sizeof (ufd));
+
+ for( i = 0; i < fdc; i++ )
+ {
+ ufd[i].fd = fdv[i];
+ ufd[i].events = POLLIN;
+ }
- /* Initialize file descriptor set */
- FD_ZERO( &fds_r );
- FD_SET( fd, &fds_r );
- FD_ZERO( &fds_e );
- FD_SET( fd, &fds_e );
+ n = poll( ufd, fdc, delay_ms );
+ if( n == -1 )
+ goto error;
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
+ assert ((unsigned)n <= fdc);
- } while( (i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout)) == 0
- || ( i_ret < 0 && errno == EINTR ) );
+ if (n == 0) // timeout
+ continue;
- if( i_ret < 0 )
+ for (i = 0;; i++)
+ {
+ 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;
+
+ fdc = 1;
+ fdv += i;
+ vsv += i;
+ break;
+ }
+
+ if( (*vsv) != NULL )
+ {
+ n = (*vsv)->pf_recv( (*vsv)->p_sys, p_buf, i_buflen );
+ }
+ else
{
#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "network select error (%d)", WSAGetLastError() );
+ n = recv( *fdv, p_buf, i_buflen, 0 );
#else
- msg_Err( p_this, "network select error (%s)", strerror(errno) );
+ n = read( *fdv, p_buf, i_buflen );
#endif
- return i_total > 0 ? i_total : -1;
}
- 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)
- if( WSAGetLastError() == WSAEWOULDBLOCK )
+ switch( WSAGetLastError() )
{
- /* only happens with p_vs (SSL) - not really an error */
+ 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, "Receive error: "
+ "Increase the mtu size (--mtu option)" );
+ i_total += i_buflen;
+ return i_total;
}
- 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 )
- {
- msg_Err( p_this, "recv() failed. "
- "Increase the mtu size (--mtu option)" );
- i_total += i_data;
- }
- else if( WSAGetLastError() == WSAEINTR ) continue;
- else msg_Err( p_this, "recv failed (%i)", WSAGetLastError() );
#else
- /* EAGAIN only happens with p_vs (TLS) and it's not an error */
- if( errno != EAGAIN )
- msg_Err( p_this, "recv failed (%s)", strerror(errno) );
+ if( errno == EAGAIN ) /* spurious wake-up (sucks if fdc > 1) */
+ continue;
#endif
- return i_total > 0 ? i_total : -1;
- }
- else if( i_recv == 0 )
- {
- /* Connection closed */
- b_retry = VLC_FALSE;
+ goto error;
}
- p_data += i_recv;
- i_data -= i_recv;
- i_total+= i_recv;
- if( !b_retry )
+ 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)
{
- break;
+ wait_ms -= delay_ms;
+ if (wait_ms == 0)
+ return i_total; // time's up!
}
}
return i_total;
+
+error:
+ if( errno != EINTR )
+ msg_Err( p_this, "Read error: %s", net_strerror (net_errno) );
+ return i_total ? (ssize_t)i_total : -1;
}
+
/*****************************************************************************
- * __net_ReadNonBlock:
+ * __net_Read:
*****************************************************************************
- * Read from a network socket, non blocking mode (with timeout)
+ * Read from a network socket
+ * If b_retry is true, then we repeat until we have read the right amount of
+ * data
*****************************************************************************/
-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)
+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 )
{
- 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 )
- {
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "network select error (%d)", WSAGetLastError() );
-#else
- msg_Err( p_this, "network select error (%s)", strerror(errno) );
-#endif
- 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 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 )
- {
- 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 -1;
- }
+ return net_ReadInner( p_this, 1, &(int){ fd },
+ &(const v_socket_t *){ p_vs },
+ p_data, i_data, -1, b_retry );
+}
- return i_recv ? i_recv : -1; /* !i_recv -> connection closed if tcp */
- }
- /* We will never be here */
- return -1;
+/*****************************************************************************
+ * __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);
}
+
/*****************************************************************************
* __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 )
+int __net_Select( vlc_object_t *restrict p_this, const int *restrict pi_fd,
+ int i_fd, uint8_t *restrict 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 );
- }
-
- 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)", strerror(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;
- }
- }
- }
+ const v_socket_t *vsv[i_fd];
+ memset( vsv, 0, sizeof (vsv) );
- /* We will never be here */
- return -1;
+ return net_ReadInner( p_this, i_fd, pi_fd, vsv, p_data, i_data,
+ i_wait / 1000, VLC_FALSE );
}
/* Write exact amount requested */
-int __net_Write( vlc_object_t *p_this, int fd, v_socket_t *p_vs,
+int __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
const uint8_t *p_data, int i_data )
{
- struct timeval timeout;
- fd_set fds_w, fds_e;
- int i_send;
- int i_total = 0;
- int i_ret;
-
- vlc_bool_t b_die = p_this->b_die;
+ size_t i_total = 0;
while( i_data > 0 )
{
- do
- {
- if( p_this->b_die != b_die )
- {
- return 0;
- }
+ if( p_this->b_die )
+ return i_total;
+
+#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);
- /* Initialize file descriptor set */
- FD_ZERO( &fds_w );
- FD_SET( fd, &fds_w );
- FD_ZERO( &fds_e );
- FD_SET( fd, &fds_e );
+#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);
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
+ 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;
+ }
- } while( (i_ret = select(fd + 1, NULL, &fds_w, &fds_e, &timeout)) == 0
- || ( i_ret < 0 && errno == EINTR ) );
+ case 0:
+ continue;
+ }
- if( i_ret < 0 )
- {
+ if (p_vs != NULL)
+ val = p_vs->pf_send (p_vs->p_sys, p_data, i_data);
+ else
#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "network selection error (%d)", WSAGetLastError() );
+ 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 )
- {
- /* 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;
- }
+ if (val == -1)
+ return i_total ? (int)i_total : -1;
+ if (val == 0)
+ return i_total;
- p_data += i_send;
- i_data -= i_send;
- i_total+= i_send;
+ p_data += val;
+ i_data -= val;
+ i_total += val;
}
+
return i_total;
}
-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;
return psz_line;
}
-int net_Printf( vlc_object_t *p_this, int fd, v_socket_t *p_vs,
+int net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
const char *psz_fmt, ... )
{
int i_ret;
return i_ret;
}
-int __net_vaPrintf( vlc_object_t *p_this, int fd, v_socket_t *p_vs,
+int __net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
const char *psz_fmt, va_list args )
{
char *psz;
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