#include <stdlib.h>
#include <stdio.h>
+#include <limits.h>
#include <errno.h>
#include <assert.h>
# include <poll.h>
#endif
-#include "network.h"
+#include <vlc_network.h>
#ifndef INADDR_ANY
# define INADDR_ANY 0x00000000
# define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
+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)
{
#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 30
+# define PROTECTION_LEVEL_UNRESTRICTED 10
# endif
if (family == AF_INET6)
setsockopt (fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
}
+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)
+ {
+ 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:
*****************************************************************************
}
-static int
+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,
{
size_t i_total = 0;
- do
+ while (i_buflen > 0)
{
- unsigned int i;
- int n, delay_ms;
-#ifdef HAVE_POLL
+ unsigned i;
+ ssize_t n;
struct pollfd ufd[fdc];
-#else
- int maxfd = -1;
- fd_set set;
-#endif
-
- if( i_buflen == 0 )
- return i_total; // output buffer full
- delay_ms = 500;
- if( (wait_ms != -1) && (wait_ms < 500) )
+ 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)
{
errno = EINTR;
goto error;
}
-#ifdef HAVE_POLL
- memset(ufd, 0, sizeof (ufd) );
+ memset (ufd, 0, sizeof (ufd));
for( i = 0; i < fdc; i++ )
{
if( n == -1 )
goto error;
- assert( (unsigned int)n <= fdc );
+ assert ((unsigned)n <= fdc);
- for( i = 0; n > 0; i++ )
+ if (n == 0) // timeout
+ continue;
+
+ for (i = 0;; i++)
{
- if( (i_total > 0) && (ufd[i].revents & POLLERR) )
+ if ((i_total > 0) && (ufd[i].revents & POLLERR))
return i_total; // error will be dequeued on next run
- if( ufd[i].revents )
- {
- fdc = 1;
- fdv += i;
- vsv += i;
- n--;
- goto receive;
- }
- }
-#else
- FD_ZERO (&set);
+ if ((ufd[i].revents & POLLIN) == 0)
+ continue;
- for( i = 0; i < fdc; i++ )
- {
-#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];
+ fdc = 1;
+ fdv += i;
+ vsv += i;
+ break;
}
- n = select( maxfd + 1, &set, NULL, NULL,
- (wait_ms == -1) ? NULL
- : &(struct timeval){ 0, delay_ms * 1000 } );
- if( n == -1 )
- goto error;
-
- for( i = 0; n > 0; i++ )
- if( FD_ISSET (fdv[i], &set) )
- {
- fdc = 1;
- fdv += i;
- vsv += i;
- n--;
- goto receive;
- }
-#endif
-
- continue;
-
-receive:
if( (*vsv) != NULL )
{
n = (*vsv)->pf_recv( (*vsv)->p_sys, p_buf, i_buflen );
p_buf += n;
i_buflen -= n;
- if( wait_ms == -1 )
- {
- if( !waitall )
- return i_total;
- }
- else
+ if (!waitall)
+ return i_total;
+
+ if (wait_ms != -1)
{
wait_ms -= delay_ms;
+ if (wait_ms == 0)
+ return i_total; // time's up!
}
}
- while( wait_ms );
-
- return i_total; // timeout
+ return i_total;
error:
- msg_Err( p_this, "Read error: %s", net_strerror (net_errno) );
- return i_total ? (int)i_total : -1;
+ if( errno != EINTR )
+ msg_Err( p_this, "Read error: %s", net_strerror (net_errno) );
+ return i_total ? (ssize_t)i_total : -1;
}
* 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 )
{
- if( pp_vs == NULL )
- {
- const v_socket_t *vsv[i_fd];
- memset( vsv, 0, sizeof (vsv) );
-
- return net_ReadInner( p_this, i_fd, pi_fd, vsv, p_data, i_data,
- i_wait / 1000, VLC_FALSE );
- }
+ const v_socket_t *vsv[i_fd];
+ memset( vsv, 0, sizeof (vsv) );
- return net_ReadInner( p_this, i_fd, pi_fd, pp_vs, p_data, i_data,
+ return net_ReadInner( p_this, i_fd, pi_fd, vsv, p_data, i_data,
i_wait / 1000, VLC_FALSE );
}
projects / vlc / blobdiff