/*****************************************************************************
* tcp.c:
*****************************************************************************
- * Copyright (C) 2004-2005 the VideoLAN team
+ * Copyright (C) 2004-2005 VLC authors and VideoLAN
* Copyright (C) 2005-2006 Rémi Denis-Courmont
* $Id$
*
* Authors: Laurent Aimar <fenrir@videolan.org>
* Rémi Denis-Courmont <rem # videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#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
+#include <unistd.h>
#ifdef HAVE_POLL
# include <poll.h>
#endif
#include <vlc_network.h>
-#if defined (WIN32) || defined (UNDER_CE)
+#if defined (_WIN32)
# undef EINPROGRESS
# define EINPROGRESS WSAEWOULDBLOCK
+# undef EWOULDBLOCK
+# define EWOULDBLOCK WSAEWOULDBLOCK
+# undef EAGAIN
+# define EAGAIN WSAEWOULDBLOCK
# undef EINTR
# define EINTR WSAEINTR
-# undef ETIMEDOUT
-# define ETIMEDOUT WSAETIMEDOUT
#endif
#include "libvlc.h" /* vlc_object_waitpipe */
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;
char *psz_socks;
- int i_realport, i_val, i_handle = -1;
+ int i_realport, i_handle = -1;
int evfd = vlc_object_waitpipe (p_this);
if (evfd == -1)
return -1;
- memset( &hints, 0, sizeof( hints ) );
- hints.ai_socktype = SOCK_STREAM;
-
- psz_socks = var_CreateGetNonEmptyString( p_this, "socks" );
+ psz_socks = var_InheritString( p_this, "socks" );
if( psz_socks != NULL )
{
char *psz = strchr( psz_socks, ':' );
psz_realhost = psz_socks;
i_realport = ( psz != NULL ) ? atoi( psz ) : 1080;
- hints.ai_flags &= ~AI_NUMERICHOST;
msg_Dbg( p_this, "net: connecting to %s port %d (SOCKS) "
"for %s port %d", psz_realhost, i_realport,
i_realport );
}
- i_val = vlc_getaddrinfo( p_this, psz_realhost, i_realport, &hints, &res );
- free( psz_socks );
+ struct addrinfo hints = {
+ .ai_socktype = type,
+ .ai_protocol = proto,
+ .ai_flags = AI_NUMERICSERV | AI_IDN,
+ }, *res;
- if( i_val )
+ int val = vlc_getaddrinfo (psz_realhost, i_realport, &hints, &res);
+
+ if (val)
{
- msg_Err( p_this, "cannot resolve %s port %d : %s", psz_realhost,
- i_realport, vlc_gai_strerror( i_val ) );
+ msg_Err (p_this, "cannot resolve %s port %d : %s", psz_realhost,
+ i_realport, gai_strerror (val));
+ free( psz_socks );
return -1;
}
+ free( psz_socks );
+
+ int timeout = var_InheritInteger (p_this, "ipv4-timeout");
+ if (timeout < 0)
+ timeout = -1;
- for( ptr = res; ptr != NULL; ptr = ptr->ai_next )
+ for (struct addrinfo *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" );
+ msg_Dbg( p_this, "socket error: %s", vlc_strerror_c(net_errno) );
continue;
}
if( connect( fd, ptr->ai_addr, ptr->ai_addrlen ) )
{
- int timeout, val;
+ int val;
if( net_errno != EINPROGRESS && net_errno != EINTR )
{
- msg_Err( p_this, "connection failed: %m" );
+ msg_Err( p_this, "connection failed: %s",
+ vlc_strerror_c(net_errno) );
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 },
switch (val)
{
case -1: /* error */
- msg_Err (p_this, "connection polling error: %m");
+ msg_Err (p_this, "polling error: %s",
+ vlc_strerror_c(net_errno));
goto next_ai;
case 0: /* timeout */
if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &val,
&(socklen_t){ sizeof (val) }) || val)
{
- errno = val;
- msg_Err (p_this, "connection failed: %m");
+ msg_Err (p_this, "connection failed: %s",
+ vlc_strerror_c(val));
goto next_ai;
}
}
continue;
}
- vlc_freeaddrinfo( res );
+ freeaddrinfo( res );
if( i_handle == -1 )
return -1;
if( psz_socks != NULL )
{
/* NOTE: psz_socks already free'd! */
- char *psz_user = var_CreateGetNonEmptyString( p_this, "socks-user" );
- char *psz_pwd = var_CreateGetNonEmptyString( p_this, "socks-pwd" );
+ char *psz_user = var_InheritString( p_this, "socks-user" );
+ char *psz_pwd = var_InheritString( p_this, "socks-pwd" );
if( SocksHandshakeTCP( p_this, i_handle, 5, psz_user, psz_pwd,
psz_host, i_port ) )
int net_AcceptSingle (vlc_object_t *obj, int lfd)
{
- int fd;
- do
- fd = accept (lfd, NULL, NULL);
- while (fd == -1 && errno == EINTR);
-
+ int fd = vlc_accept (lfd, NULL, NULL, true);
if (fd == -1)
{
- if (net_errno != EAGAIN)
- msg_Err (obj, "accept failed (from socket %d): %m", lfd);
+ if (net_errno != EAGAIN && net_errno != EWOULDBLOCK)
+ msg_Err (obj, "accept failed (from socket %d): %s", lfd,
+ vlc_strerror_c(net_errno));
return -1;
}
msg_Dbg (obj, "accepted socket %d (from socket %d)", fd, lfd);
- net_SetupSocket (fd);
+ setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof(int));
return fd;
}
-/*****************************************************************************
- * __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 */
+ ufd[i].fd = (i < n) ? pi_fd[i] : evfd;
+ ufd[i].events = POLLIN;
+ }
+ ufd[n].revents = 0;
- switch (poll (ufd, n, timeout))
+ for (;;)
+ {
+ while (poll (ufd, n + (evfd != -1), -1) == -1)
{
- case -1:
- if (net_errno == EINTR)
- continue;
- msg_Err (p_this, "poll error: %m");
- return -1;
- case 0:
- errno = ETIMEDOUT;
+ if (net_errno != EINTR)
+ {
+ msg_Err (p_this, "poll error: %s", vlc_strerror_c(net_errno));
return -1;
- }
-
- if (ufd[n].revents)
- {
- errno = EINTR;
- break;
+ }
}
for (unsigned i = 0; i < n; i++)
pi_fd[n - 1] = sfd;
return fd;
}
+
+ if (ufd[n].revents)
+ {
+ errno = EINTR;
+ break;
+ }
}
return -1;
}
return VLC_SUCCESS;
/* We negotiate authentication */
-
- if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
- b_auth = true;
-
buffer[0] = i_socks_version; /* SOCKS version */
- if( b_auth )
+ if( psz_socks_user != NULL && psz_socks_passwd != NULL )
{
buffer[1] = 2; /* Number of methods */
buffer[2] = 0x00; /* - No auth required */
buffer[3] = 0x02; /* - USer/Password */
i_len = 4;
+ b_auth = true;
}
else
{
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 == 4 )
{
- struct addrinfo hints, *p_res;
-
/* v4 only support ipv4 */
- memset (&hints, 0, sizeof (hints));
- hints.ai_family = AF_INET;
- if( vlc_getaddrinfo( p_obj, psz_host, 0, &hints, &p_res ) )
+ static const struct addrinfo hints = {
+ .ai_family = AF_INET,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
+ .ai_flags = AI_IDN,
+ };
+ struct addrinfo *res;
+
+ if (vlc_getaddrinfo (psz_host, 0, &hints, &res))
return VLC_EGENERIC;
buffer[0] = i_socks_version;
buffer[1] = 0x01; /* CONNECT */
SetWBE( &buffer[2], i_port ); /* Port */
- memcpy( &buffer[4], /* Address */
- &((struct sockaddr_in *)(p_res->ai_addr))->sin_addr, 4 );
- vlc_freeaddrinfo( p_res );
+ memcpy (&buffer[4], /* Address */
+ &((struct sockaddr_in *)(res->ai_addr))->sin_addr, 4);
+ freeaddrinfo (res);
buffer[8] = 0; /* Empty user id */
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