* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <stdlib.h>
#include <stdio.h>
# define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
+#ifdef HAVE_LINUX_DCCP_H
+/* TODO: use glibc instead of linux-kernel headers */
+# include <linux/dccp.h>
+# 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
+ 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)
{
if (fd == -1)
{
if (net_errno != EAFNOSUPPORT)
- msg_Err (p_this, "cannot create socket: %s",
- net_strerror (net_errno));
+ msg_Err (p_this, "cannot create socket: %m");
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));
&(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;
}
int *net_Listen (vlc_object_t *p_this, const char *psz_host,
- int i_port, int family, int socktype, int protocol)
+ int i_port, int protocol)
{
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 ));
- hints.ai_family = family;
- hints.ai_socktype = socktype;
+ /* 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;
msg_Dbg (p_this, "net: listening to %s port %d", psz_host, i_port);
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);
+ int fd = net_Socket (p_this, ptr->ai_family, socktype, protocol);
if (fd == -1)
{
- msg_Dbg (p_this, "socket error: %s", net_strerror (net_errno));
+ msg_Dbg (p_this, "socket error: %m");
continue;
}
#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,
else
#endif
{
- msg_Err (p_this, "socket bind error (%s)",
- net_strerror( saved_errno ) );
+ msg_Err (p_this, "socket bind error (%m)");
continue;
}
}
}
/* Listen */
- switch (ptr->ai_socktype)
+ 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 (%s)",
- net_strerror (net_errno));
+ msg_Err (p_this, "socket listen error (%m)");
net_Close (fd);
continue;
}
}
-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:
+ * __net_Read:
*****************************************************************************
- * Close a network handle
+ * 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.
*****************************************************************************/
-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,
- const v_socket_t *const *restrict vsv,
- uint8_t *restrict p_buf, size_t i_buflen,
- int wait_ms, vlc_bool_t waitall )
+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)
{
size_t i_total = 0;
+ 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)
{
- unsigned i;
- ssize_t n;
- struct pollfd ufd[fdc];
+ ufd[0].revents = ufd[1].revents = 0;
- int delay_ms = 500;
- if ((wait_ms != -1) && (wait_ms < 500))
- delay_ms = wait_ms;
-
- if (p_this->b_die)
+ if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0)
{
- errno = EINTR;
- goto error;
+ if (errno != EINTR)
+ goto error;
+ continue;
}
- memset (ufd, 0, sizeof (ufd));
-
- for( i = 0; i < fdc; i++ )
+#ifndef POLLRDHUP /* This is nice but non-portable */
+# define POLLRDHUP 0
+#endif
+ if (i_total > 0)
{
- ufd[i].fd = fdv[i];
- ufd[i].events = POLLIN;
+ /* 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;
}
-
- n = poll( ufd, fdc, delay_ms );
- if( n == -1 )
- goto error;
-
- assert ((unsigned)n <= fdc);
-
- if (n == 0) // timeout
- continue;
-
- for (i = 0;; i++)
+ else
{
- 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 (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;
+ }
}
- if( (*vsv) != NULL )
+ assert (ufd[0].revents);
+
+ ssize_t n;
+ if (vs != NULL)
{
- n = (*vsv)->pf_recv( (*vsv)->p_sys, p_buf, i_buflen );
+ n = vs->pf_recv (vs->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 (fd, p_buf, i_buflen, 0);
#else
- n = read( *fdv, p_buf, i_buflen );
+ n = read (fd, 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 */
+ /* only happens with vs != NULL (TLS) - not really an error */
continue;
case WSAEMSGSIZE:
/* 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;
}
#else
- if( errno == EAGAIN ) /* spurious wake-up (sucks if fdc > 1) */
- continue;
+ switch (errno)
+ {
+ case EAGAIN: /* spurious wakeup or no TLS data */
+ case EINTR: /* asynchronous signal */
+ continue;
+ }
#endif
goto error;
}
- if (n == 0) // EOF
- return i_total;
+ 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 <waitall> with datagrams in the
+ * first place.
+ */
+ break; // EOF
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!
- }
+ break;
}
+
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_Read:
- *****************************************************************************
- * Read from a network socket
- * If b_retry is true, then we repeat until we have read the right amount of
- * data
- *****************************************************************************/
-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 }, buf, len, -1,
- b_retry );
-}
-
-
-/*****************************************************************************
- * __net_ReadNonBlock:
- *****************************************************************************
- * Read from a network socket, non blocking mode (with timeout)
- *****************************************************************************/
-ssize_t __net_ReadNonBlock( vlc_object_t *restrict p_this, int fd,
- const v_socket_t *restrict p_vs,
- uint8_t *restrict buf, size_t len, mtime_t i_wait)
-{
- return net_ReadInner (p_this, 1, &(int){ fd },
- &(const v_socket_t *){ p_vs },
- buf, len, i_wait / 1000, VLC_FALSE);
-}
-
-
-/*****************************************************************************
- * __net_Select:
- *****************************************************************************
- * Read from several sockets (with timeout). 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, mtime_t i_wait )
-{
- const v_socket_t *vsv[nfd];
- memset( vsv, 0, sizeof (vsv) );
-
- return net_ReadInner( p_this, nfd, fds, vsv, buf, len,
- i_wait / 1000, VLC_FALSE );
+ msg_Err (p_this, "Read error: %m");
+silent:
+ return -1;
}
const uint8_t *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, 1, -1) == -1)
{
- case -1:
- msg_Err (p_this, "Write error: %s", net_strerror (net_errno));
- goto out;
-
- case 0:
+ if (errno == EINTR)
continue;
+ msg_Err (p_this, "Polling error: %m");
+ return -1;
}
- if ((ufd[0].revents & POLLERR) && (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);
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);
if (val == -1)
{
- msg_Err (p_this, "Write error: %s", net_strerror (net_errno));
+ if (errno == EINTR)
+ continue;
+ msg_Err (p_this, "Write error: %m");
break;
}
- if (val == 0)
- return i_total;
p_data += val;
i_data -= val;
i_total += val;
}
-out:
if ((i_total > 0) || (i_data == 0))
return i_total;
+error:
return -1;
}
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 )
{
/*****************************************************************************
* inet_pton replacement for obsolete and/or crap operating systems
*****************************************************************************/
-#ifndef HAVE_INET_PTON
-int inet_pton(int af, const char *src, void *dst)
+int vlc_inet_pton(int af, const char *src, void *dst)
{
+#ifndef HAVE_INET_PTON
# 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. */
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 );
memcpy( dst, &ipv4, 4 );
# endif /* WIN32 */
return 0;
-}
+#else /* HAVE_INET_PTON */
+ return inet_pton( af, src, dst );
#endif /* HAVE_INET_PTON */
+}
-#ifndef HAVE_INET_NTOP
-#ifdef WIN32
-const char *inet_ntop(int af, const void * src,
+const char *vlc_inet_ntop(int af, const void * src,
char * dst, socklen_t cnt)
{
+#ifndef HAVE_INET_NTOP
+#ifdef WIN32
switch( af )
{
#ifdef AF_INET6
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),
+ if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr,
+ sizeof(struct sockaddr_in6),
NULL, dst, &cnt) )
{
dst[cnt] = '\0';
}
errno = EAFNOSUPPORT;
return NULL;
+#else /* WIN32 */
+ return NULL;
+#endif /* WIN32 */
+#else /* HAVE_INET_NTOP */
+ return inet_ntop( af, src, dst, cnt );
+#endif /* HAVE_INET_NTOP */
}
-#endif
-#endif
+
+#ifdef WIN32
+ /* vlc_sendmsg, vlc_recvmsg Defined in winsock.c */
+#else /* !WIN32 */
+ssize_t vlc_sendmsg (int s, struct msghdr *hdr, int flags)
+{
+ return sendmsg (s, hdr, flags);
+}
+
+ssize_t vlc_recvmsg (int s, struct msghdr *hdr, int flags)
+{
+ return recvmsg (s, hdr, flags);
+}
+#endif /* WIN32 */
+
projects / vlc / blobdiff