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)
{
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));
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)",
}
-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)
-{
-#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,
+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 )
+ uint8_t *restrict p_buf, size_t i_buflen, vlc_bool_t waitall)
{
size_t i_total = 0;
while (i_buflen > 0)
{
- 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 ) || ( p_this->p_libvlc->b_die ) )
{
+#if defined(WIN32) || defined(UNDER_CE)
+ WSASetLastError (WSAEINTR);
+#else
errno = EINTR;
+#endif
goto error;
}
- memset (ufd, 0, sizeof (ufd));
+ struct pollfd ufd[fdc];
- for( i = 0; i < fdc; i++ )
+ for (unsigned i = 0; i < fdc; i++)
{
ufd[i].fd = fdv[i];
ufd[i].events = POLLIN;
+ ufd[i].revents = 0;
}
- n = poll( ufd, fdc, delay_ms );
- if( n == -1 )
- goto error;
-
- assert ((unsigned)n <= fdc);
+ switch (poll (ufd, fdc, 500))
+ {
+ case -1:
+ goto error;
- if (n == 0) // timeout
- continue;
+ case 0: // timeout
+ continue;
+ }
- for (i = 0;; i++)
+ for (unsigned i = 0;; i++)
{
- if ((i_total > 0) && (ufd[i].revents & POLLERR))
- return i_total; // error will be dequeued on next run
+ assert (i < fdc); /* no events found = bug ! */
- if ((ufd[i].revents & POLLIN) == 0)
+ 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 (ufd[i].revents & POLLRDHUP)
+ return 0; // EOF, read() would yield 0
+ }
+
fdc = 1;
fdv += i;
vsv += i;
+
break;
}
- if( (*vsv) != NULL )
+ ssize_t n;
+ if (*vsv != NULL)
{
- n = (*vsv)->pf_recv( (*vsv)->p_sys, p_buf, i_buflen );
+ n = (*vsv)->pf_recv ((*vsv)->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 (*fdv, p_buf, i_buflen, 0);
#else
- n = read( *fdv, p_buf, i_buflen );
+ n = read (*fdv, 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 */
/* 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;
+
+ default:
+ goto error;
}
#else
- if( errno == EAGAIN ) /* spurious wake-up (sucks if fdc > 1) */
+ /* spurious wake-up or TLS did not yield any actual data */
+ if (errno == EAGAIN)
continue;
-#endif
goto error;
+#endif
}
- 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)
- {
- wait_ms -= delay_ms;
- if (wait_ms == 0)
- return i_total; // time's up!
- }
+ if ((n == 0) || !waitall)
+ break;
}
return i_total;
error:
- if( errno != EINTR )
- msg_Err( p_this, "Read error: %s", net_strerror (net_errno) );
+ msg_Err (p_this, "Read error: %s", net_strerror (net_errno));
return i_total ? (ssize_t)i_total : -1;
}
*****************************************************************************
* Read from a network socket
* If b_retry is true, then we repeat until we have read the right amount of
- * data
+ * 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, -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);
+ buf, len, b_retry );
}
/*****************************************************************************
* __net_Select:
*****************************************************************************
- * Read from several sockets (with timeout). Takes data from the first socket
- * that has some.
+ * 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, mtime_t i_wait )
+ 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,
- i_wait / 1000, VLC_FALSE );
+ return net_ReadInner( p_this, nfd, fds, vsv,
+ buf, len, VLC_FALSE );
}
continue;
}
- if ((ufd[0].revents & POLLERR) && (i_total > 0))
+ 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
-#if defined(WIN32) || defined(UNDER_CE)
+#ifdef WIN32
val = send (fd, p_data, i_data, 0);
#else
val = write (fd, p_data, i_data);
msg_Err (p_this, "Write error: %s", net_strerror (net_errno));
break;
}
- if (val == 0)
- return i_total;
p_data += val;
i_data -= val;
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';
projects / vlc / blobdiff