* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <stdlib.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){ 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;
}
break;
case 33: /* DCCP */
#ifdef __linux__
- socktype = 6;
+# ifndef SOCK_DCCP
+# define SOCK_DCCP 6
+# endif
+ socktype = SOCK_DCCP;
#endif
break;
}
}
/* Listen */
- switch (ptr->ai_socktype)
+ switch (socktype)
{
case SOCK_STREAM:
case SOCK_RDM:
}
-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)
+/*****************************************************************************
+ * __net_Read:
+ *****************************************************************************
+ * 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.
+ *****************************************************************************/
+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)
{
- if( ( p_this->b_die ) || ( p_this->p_libvlc->b_die ) )
- {
-#if defined(WIN32) || defined(UNDER_CE)
- WSASetLastError (WSAEINTR);
-#else
- errno = EINTR;
-#endif
- 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;
- }
+ ufd[0].revents = ufd[1].revents = 0;
- switch (poll (ufd, fdc, 500))
+ if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0)
{
- case -1:
+ if (errno != EINTR)
goto error;
-
- case 0: // timeout
- continue;
+ 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_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 (i_total > 0)
+ {
+ /* 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)
{
- if (ufd[i].revents & POLLRDHUP)
- return 0; // EOF, read() would yield 0
+ 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;
}
-
- fdc = 1;
- fdv += i;
- vsv += i;
-
- break;
}
+ assert (ufd[0].revents);
+
ssize_t n;
- if (*vsv != NULL)
+ 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
{
#ifdef WIN32
- n = recv (*fdv, p_buf, i_buflen, 0);
+ n = recv (fd, p_buf, i_buflen, 0);
#else
- n = read (*fdv, p_buf, i_buflen);
+ n = read (fd, p_buf, i_buflen);
#endif
}
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:
#endif
}
+ 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 ((n == 0) || !waitall)
+ if (!waitall)
break;
}
+
return i_total;
error:
msg_Err (p_this, "Read error: %m");
- 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; in that case, a short count means EOF has been reached.
- *****************************************************************************/
-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, b_retry );
-}
-
-
-/*****************************************************************************
- * __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) );
-
- return net_ReadInner( p_this, nfd, fds, vsv,
- buf, len, VLC_FALSE );
+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: %m");
- goto out;
-
- case 0:
- continue;
+ if (errno != EINTR)
+ {
+ msg_Err (p_this, "Write error: %m");
+ goto error;
+ }
+ continue;
}
- if ((ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && (i_total > 0))
- return i_total; // error will be dequeued separately on next call
+ if (i_total > 0)
+ {
+ /* 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);
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 )
{
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 );
projects / vlc / blobdiff