# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <errno.h>
#include <assert.h>
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#if defined (WIN32) || defined (UNDER_CE)
# undef EINPROGRESS
# define EINPROGRESS WSAEWOULDBLOCK
+# undef EWOULDBLOCK
+# define EWOULDBLOCK WSAEWOULDBLOCK
# undef EINTR
# define EINTR WSAEINTR
# undef ETIMEDOUT
# define ETIMEDOUT WSAETIMEDOUT
#endif
-static int SocksNegociate( vlc_object_t *, int fd, int i_socks_version,
+#include "libvlc.h" /* vlc_object_waitpipe */
+
+static int SocksNegotiate( vlc_object_t *, int fd, int i_socks_version,
const char *psz_user, const char *psz_passwd );
static int SocksHandshakeTCP( vlc_object_t *,
int fd, int i_socks_version,
extern int net_Socket( vlc_object_t *p_this, int i_family, int i_socktype,
int i_protocol );
+#undef net_Connect
/*****************************************************************************
- * __net_Connect:
+ * net_Connect:
*****************************************************************************
* Open a network connection.
* @return socket handler or -1 on error.
*****************************************************************************/
-int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
- int type, int proto )
+int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
+ int type, int proto )
{
struct addrinfo hints, *res, *ptr;
const char *psz_realhost;
return -1;
memset( &hints, 0, sizeof( hints ) );
- hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = proto;
psz_socks = var_CreateGetNonEmptyString( p_this, "socks" );
if( psz_socks != NULL )
return -1;
}
+ int timeout = var_InheritInteger (p_this, "ipv4-timeout");
+ if (timeout < 0)
+ timeout = -1;
+
for( ptr = res; ptr != NULL; ptr = ptr->ai_next )
{
- int fd = net_Socket( p_this, ptr->ai_family, type ?: ptr->ai_socktype,
- proto ?: ptr->ai_protocol );
+ int fd = net_Socket( p_this, ptr->ai_family,
+ ptr->ai_socktype, ptr->ai_protocol );
if( fd == -1 )
{
msg_Dbg( p_this, "socket error: %m" );
if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) )
{
- int timeout, val;
+ int val;
- if( net_errno != EINPROGRESS )
+ if( net_errno != EINPROGRESS && net_errno != EINTR )
{
msg_Err( p_this, "connection failed: %m" );
goto next_ai;
}
- msg_Dbg( p_this, "connection: %m" );
-
- timeout = var_CreateGetInteger (p_this, "ipv4-timeout");
- if (timeout < 0)
- {
- msg_Err( p_this, "invalid negative value for ipv4-timeout" );
- timeout = 0;
- }
struct pollfd ufd[2] = {
{ .fd = fd, .events = POLLOUT },
int net_AcceptSingle (vlc_object_t *obj, int lfd)
{
- int fd = accept (lfd, NULL, NULL);
+ int fd;
+
+ do
+ {
+#ifdef HAVE_ACCEPT4
+ fd = accept4 (lfd, NULL, NULL, SOCK_CLOEXEC);
+ if (fd == -1 && errno == ENOSYS)
+#endif
+ fd = accept (lfd, NULL, NULL);
+ }
+ while (fd == -1 && errno == EINTR);
+
if (fd == -1)
{
- if (net_errno != EAGAIN)
+ if (net_errno != EAGAIN && net_errno != EWOULDBLOCK)
msg_Err (obj, "accept failed (from socket %d): %m", lfd);
return -1;
}
}
-/*****************************************************************************
- * __net_Accept:
- *****************************************************************************
- * Accept a connection on a set of listening sockets and return it
- *****************************************************************************/
-int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
+#undef net_Accept
+/**
+ * Accepts an new connection on a set of listening sockets.
+ * If there are no pending connections, this function will wait.
+ * @note If the thread needs to handle events other than incoming connections,
+ * you need to use poll() and net_AcceptSingle() instead.
+ *
+ * @param p_this VLC object for logging and object kill signal
+ * @param pi_fd listening socket set
+ * @return -1 on error (may be transient error due to network issues),
+ * a new socket descriptor on success.
+ */
+int net_Accept (vlc_object_t *p_this, int *pi_fd)
{
- int timeout = (i_wait < 0) ? -1 : i_wait / 1000;
int evfd = vlc_object_waitpipe (p_this);
- if (evfd == -1)
- return -1;
+ assert (pi_fd != NULL);
- assert( pi_fd != NULL );
+ unsigned n = 0;
+ while (pi_fd[n] != -1)
+ n++;
+ struct pollfd ufd[n + 1];
- for (;;)
+ /* Initialize file descriptor set */
+ for (unsigned i = 0; i <= n; i++)
{
- unsigned n = 0;
- while (pi_fd[n] != -1)
- n++;
- struct pollfd ufd[n + 1];
-
- /* Initialize file descriptor set */
- for (unsigned i = 0; i <= n; i++)
- {
- ufd[i].fd = (i < n) ? pi_fd[i] : evfd;
- ufd[i].events = POLLIN;
- ufd[i].revents = 0;
- }
- if (evfd == -1)
- n--; /* avoid EBADF */
-
- switch (poll (ufd, n, timeout))
- {
- case -1:
- if (net_errno != EINTR)
- msg_Err (p_this, "poll error: %m");
- case 0:
- return -1; /* NOTE: p_this already unlocked */
- }
+ ufd[i].fd = (i < n) ? pi_fd[i] : evfd;
+ ufd[i].events = POLLIN;
+ }
+ ufd[n].revents = 0;
- if (ufd[n].revents)
+ for (;;)
+ {
+ while (poll (ufd, n + (evfd != -1), -1) == -1)
{
- errno = EINTR;
- break;
+ if (net_errno != EINTR)
+ {
+ msg_Err (p_this, "poll error: %m");
+ return -1;
+ }
}
for (unsigned i = 0; i < n; i++)
pi_fd[n - 1] = sfd;
return fd;
}
+
+ if (ufd[n].revents)
+ {
+ errno = EINTR;
+ break;
+ }
}
return -1;
}
/*****************************************************************************
- * SocksNegociate:
+ * SocksNegotiate:
*****************************************************************************
- * Negociate authentication with a SOCKS server.
+ * Negotiate authentication with a SOCKS server.
*****************************************************************************/
-static int SocksNegociate( vlc_object_t *p_obj,
+static int SocksNegotiate( vlc_object_t *p_obj,
int fd, int i_socks_version,
const char *psz_socks_user,
const char *psz_socks_passwd )
if( i_socks_version != 5 )
return VLC_SUCCESS;
- /* We negociate authentication */
+ /* We negotiate authentication */
if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
b_auth = true;
msg_Err( p_obj, "socks: unsupported authentication method %x",
buffer[0] );
else
- msg_Err( p_obj, "socks: authentification needed" );
+ msg_Err( p_obj, "socks: authentication needed" );
return VLC_EGENERIC;
}
}
if( i_socks_version == 5 &&
- SocksNegociate( p_obj, fd, i_socks_version,
+ SocksNegotiate( p_obj, fd, i_socks_version,
psz_user, psz_passwd ) )
return VLC_EGENERIC;
/* v4 only support ipv4 */
memset (&hints, 0, sizeof (hints));
hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) )
return VLC_EGENERIC;
if( buffer[1] != 0x00 )
{
- msg_Err( p_obj, "socks: CONNECT request failed\n" );
+ msg_Err( p_obj, "socks: CONNECT request failed" );
return VLC_EGENERIC;
}
projects / vlc / blobdiff