/*****************************************************************************
* 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 )
-#else
- if( errno != EAFNOSUPPORT )
+# undef EAFNOSUPPORT
+# define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
- msg_Warn( p_this, "cannot create socket: %s",
- net_strerror(net_errno) );
- return -1;
- }
-#if defined( WIN32 ) || defined( UNDER_CE )
- {
- unsigned long i_dummy = 1;
- if( ioctlsocket( fd, FIONBIO, &i_dummy ) != 0 )
- msg_Err( p_this, "cannot set socket to non-blocking mode" );
- }
+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( fd >= FD_SETSIZE )
+ 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)
+{
+ int fd = socket (family, socktype, protocol);
+ if (fd == -1)
{
- /* We don't want to overflow select() fd_set */
- msg_Err( p_this, "cannot create socket (too many already in use)" );
- net_Close( fd );
+ if (net_errno != EAFNOSUPPORT)
+ msg_Err (p_this, "cannot create socket: %s",
+ net_strerror (net_errno));
return -1;
}
- 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 )
- {
- i_val = 30 /*PROTECTION_LEVEL_UNRESTRICTED*/;
- setsockopt( fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
- (const char*)&i_val, sizeof( i_val ) );
- }
+ if (family == AF_INET6)
+ setsockopt (fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
+ &(int){ PROTECTION_LEVEL_UNRESTRICTED }, sizeof (int));
#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 family, int socktype, int protocol)
{
-#ifdef UNDER_CE
- CloseHandle( (HANDLE)fd );
-#elif defined( WIN32 )
- closesocket( fd );
-#else
- close( fd );
-#endif
-}
+ struct addrinfo hints, *res;
-/*****************************************************************************
- * __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 )
-{
- 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;
-
- while( i_data > 0 )
- {
- do
- {
- if( p_this->b_die != b_die )
- {
- return 0;
- }
+ memset (&hints, 0, sizeof( hints ));
+ hints.ai_family = family;
+ hints.ai_socktype = socktype;
+ hints.ai_flags = AI_PASSIVE;
- /* Initialize file descriptor set */
- FD_ZERO( &fds_r );
- FD_SET( fd, &fds_r );
- FD_ZERO( &fds_e );
- FD_SET( fd, &fds_e );
+ msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port);
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
+ int i_val = vlc_getaddrinfo (p_this, psz_host, i_port, &hints, &res);
+ if (i_val)
+ {
+ msg_Err (p_this, "Cannot resolve %s port %d : %s", psz_host, i_port,
+ vlc_gai_strerror (i_val));
+ return NULL;
+ }
- } while( (i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout)) == 0
- || ( i_ret < 0 && errno == EINTR ) );
+ int *sockv = NULL;
+ unsigned sockc = 0;
- if( i_ret < 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_Err( p_this, "network select error (%s)",
- net_strerror(net_errno) );
- return i_total > 0 ? i_total : -1;
+ msg_Dbg (p_this, "socket error: %s", net_strerror (net_errno));
+ 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 )
+ /* 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))
{
-#if defined(WIN32) || defined(UNDER_CE)
- if( WSAGetLastError() == WSAEWOULDBLOCK )
+ // This works for IPv4 too - don't worry!
+ struct sockaddr_in6 dumb =
{
- /* only happens with p_vs (SSL) - not really an error */
+ .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
- /* 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 )
+#endif
{
- msg_Err( p_this, "recv() failed. "
- "Increase the mtu size (--mtu option)" );
- i_total += i_data;
+ msg_Err (p_this, "socket bind error (%s)",
+ net_strerror( saved_errno ) );
+ continue;
}
- else if( WSAGetLastError() == WSAEINTR ) continue;
-#else
- /* EAGAIN only happens with p_vs (TLS) and it's not an error */
- if( errno != EAGAIN )
-#endif
- msg_Err( p_this, "recv failed: %s", net_strerror(net_errno) );
- return i_total > 0 ? i_total : -1;
}
- else if( i_recv == 0 )
+
+ if (net_SockAddrIsMulticast (ptr->ai_addr, ptr->ai_addrlen))
{
- /* Connection closed */
- b_retry = VLC_FALSE;
+ if (net_Subscribe (p_this, fd, ptr->ai_addr, ptr->ai_addrlen))
+ {
+ net_Close (fd);
+ continue;
+ }
}
- p_data += i_recv;
- i_data -= i_recv;
- i_total+= i_recv;
- if( !b_retry )
+ /* Listen */
+ switch (ptr->ai_socktype)
{
- break;
+ 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)",
+ 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);
}
- 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;
+ vlc_freeaddrinfo (res);
- /* Initialize file descriptor set */
- FD_ZERO( &fds_r );
- FD_SET( fd, &fds_r );
- FD_ZERO( &fds_e );
- FD_SET( fd, &fds_e );
+ if (sockv != NULL)
+ sockv[sockc] = -1;
- timeout.tv_sec = 0;
- timeout.tv_usec = i_wait;
+ return sockv;
+}
- i_ret = select(fd + 1, &fds_r, NULL, &fds_e, &timeout);
- if( i_ret < 0 && errno == EINTR )
- {
- return 0;
- }
- else if( i_ret < 0 )
+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, vlc_bool_t waitall)
+{
+ size_t i_total = 0;
+
+ while (i_buflen > 0)
{
+ if( ( p_this->b_die ) || ( p_this->p_libvlc->b_die ) )
+ {
#if defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "network select error (%d)", WSAGetLastError() );
+ WSASetLastError (WSAEINTR);
#else
- msg_Err( p_this, "network select error (%s)", strerror(errno) );
+ errno = EINTR;
#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
+ goto error;
+ }
+
+ struct pollfd ufd[fdc];
+
+ for (unsigned i = 0; i < fdc; i++)
+ {
+ ufd[i].fd = fdv[i];
+ ufd[i].events = POLLIN;
+ ufd[i].revents = 0;
+ }
+
+ switch (poll (ufd, fdc, 500))
+ {
+ case -1:
+ goto error;
+
+ case 0: // timeout
+ continue;
+ }
+
+ for (unsigned i = 0;; i++)
+ {
+ assert (i < fdc); /* no events found = bug ! */
+
+ if (ufd[i].revents == 0)
+ continue;
+
+#ifndef POLLRDHUP /* This is nice but non-portable */
+# define POLLRDHUP 0
#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 (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;
+ }
+
+ ssize_t n;
+ if (*vsv != NULL)
+ {
+ n = (*vsv)->pf_recv ((*vsv)->p_sys, p_buf, i_buflen);
+ }
+ else
+ {
+#ifdef WIN32
+ n = recv (*fdv, p_buf, i_buflen, 0);
+#else
+ n = read (*fdv, p_buf, i_buflen);
+#endif
+ }
+
+ 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 (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)");
+ n = i_buflen;
+ break;
+
+ default:
+ goto error;
}
- else msg_Err( p_this, "recv failed (%i)", WSAGetLastError() );
#else
- msg_Err( p_this, "recv failed (%s)", strerror(errno) );
+ /* spurious wake-up or TLS did not yield any actual data */
+ if (errno == EAGAIN)
+ continue;
+ goto error;
#endif
- return -1;
}
- return i_recv ? i_recv : -1; /* !i_recv -> connection closed if tcp */
+ i_total += n;
+ p_buf += n;
+ i_buflen -= n;
+
+ if ((n == 0) || !waitall)
+ break;
}
+ return i_total;
- /* We will never be here */
- return -1;
+error:
+ msg_Err (p_this, "Read error: %s", net_strerror (net_errno));
+ return i_total ? (ssize_t)i_total : -1;
}
+
/*****************************************************************************
- * __net_Select:
+ * __net_Read:
*****************************************************************************
- * Read from several sockets (with timeout). Takes data from the first socket
- * that has some.
+ * Read from a network socket
+ * If b_retry 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.
*****************************************************************************/
-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 )
+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 )
{
- 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 );
+ return net_ReadInner( p_this, 1, &(int){ fd },
+ &(const v_socket_t *){ p_vs },
+ buf, len, b_retry );
+}
- 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;
- }
- }
- }
+/*****************************************************************************
+ * __net_Select:
+ *****************************************************************************
+ * Read from several sockets. Takes data from the first socket that has some.
+ *****************************************************************************/
+ssize_t __net_Select( vlc_object_t *restrict p_this,
+ const int *restrict fds, int nfd,
+ uint8_t *restrict buf, size_t len )
+{
+ const v_socket_t *vsv[nfd];
+ memset( vsv, 0, sizeof (vsv) );
- /* We will never be here */
- return -1;
+ 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, 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;
-
- 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 )
+ break;
- /* Initialize file descriptor set */
- FD_ZERO( &fds_w );
- FD_SET( fd, &fds_w );
- FD_ZERO( &fds_e );
- FD_SET( fd, &fds_e );
+ struct pollfd ufd[1];
+ memset (ufd, 0, sizeof (ufd));
+ ufd[0].fd = fd;
+ ufd[0].events = POLLOUT;
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
+ int val = poll (ufd, 1, 500);
+ switch (val)
+ {
+ case -1:
+ msg_Err (p_this, "Write error: %s", net_strerror (net_errno));
+ goto out;
- } 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 defined(WIN32) || defined(UNDER_CE)
- msg_Err( p_this, "network selection error (%d)", WSAGetLastError() );
+ 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
+#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: %s", net_strerror (net_errno));
+ 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;
+
+out:
+ if ((i_total > 0) || (i_data == 0))
+ return i_total;
+
+ 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;
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;
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;
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
projects / vlc / blobdiff