* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: ipv4.c,v 1.20 2003/07/31 23:44:49 fenrir Exp $
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com>
+ * Alexis de Lattre <alexis@via.ecp.fr>
*
* 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
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
+
#include <vlc/vlc.h>
+#include <errno.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
# include <unistd.h>
#endif
-#if defined( UNDER_CE )
-# include <winsock.h>
-#elif defined( WIN32 )
+#if defined(WIN32) || defined(UNDER_CE)
+# if defined(UNDER_CE) && defined(sockaddr_storage)
+# undef sockaddr_storage
+# endif
# include <winsock2.h>
# include <ws2tcpip.h>
# define close closesocket
+# if defined(UNDER_CE)
+# undef IP_MULTICAST_TTL
+# define IP_MULTICAST_TTL 3
+# undef IP_ADD_MEMBERSHIP
+# define IP_ADD_MEMBERSHIP 5
+# endif
#else
# include <netdb.h> /* hostent ... */
# include <sys/socket.h>
#ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
#endif
+#ifndef PF_INET
+# define PF_INET AF_INET /* BeOS */
+#endif
+
/*****************************************************************************
* Local prototypes
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define TIMEOUT_TEXT N_("TCP connection timeout in ms")
+#define TIMEOUT_LONGTEXT N_( \
+ "Allows you to modify the default TCP connection timeout. This " \
+ "value should be set in millisecond units." )
+
+#define MIFACE_TEXT N_("Multicast output interface")
+#define MIFACE_LONGTEXT N_( \
+ "Indicate here the multicast output interface. " \
+ "This overrides the routing table.")
+
vlc_module_begin();
set_description( _("IPv4 network abstraction layer") );
set_capability( "network", 50 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ADVANCED );
set_callbacks( NetOpen, NULL );
+
+ add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
+ TIMEOUT_LONGTEXT, VLC_TRUE );
+ add_string( "miface-addr", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, VLC_TRUE );
vlc_module_end();
/*****************************************************************************
int i_handle, i_opt;
socklen_t i_opt_size;
struct sockaddr_in sock;
+ vlc_value_t val;
+
+ /* If IP_ADD_SOURCE_MEMBERSHIP is not defined in the headers
+ (because it's not in glibc for example), we have to define the
+ headers required for IGMPv3 here */
+#ifndef IP_ADD_SOURCE_MEMBERSHIP
+ #define IP_ADD_SOURCE_MEMBERSHIP 39
+ struct ip_mreq_source {
+ struct in_addr imr_multiaddr;
+ struct in_addr imr_interface;
+ struct in_addr imr_sourceaddr;
+ };
+#endif
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0)
* protocol */
if( (i_handle = socket( AF_INET, SOCK_DGRAM, 0 )) == -1 )
{
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_this, "cannot create socket (%s)", strerror(errno) );
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot create socket (%i)", WSAGetLastError() );
#else
- msg_Warn( p_this, "cannot create socket" );
+ msg_Warn( p_this, "cannot create socket (%s)", strerror(errno) );
#endif
return( -1 );
}
if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
(void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
-#ifdef HAVE_ERRNO_H
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR: %i)",
+ WSAGetLastError() );
+#else
msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR: %s)",
strerror(errno));
-#else
- msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR)" );
#endif
close( i_handle );
return( -1 );
}
+#ifdef SO_REUSEPORT
+ i_opt = 1;
+ if( setsockopt( i_handle, SOL_SOCKET, SO_REUSEPORT,
+ (void *) &i_opt, sizeof( i_opt ) ) == -1 )
+ {
+ msg_Warn( p_this, "cannot configure socket (SO_REUSEPORT)" );
+ }
+#endif
+
/* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid
* packet loss caused by scheduling problems */
i_opt = 0x80000;
-#if defined( SYS_BEOS )
- if( setsockopt( i_handle, SOL_SOCKET, SO_NONBLOCK,
-#else
- if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
-#endif
- (void *) &i_opt, sizeof( i_opt ) ) == -1 )
+#if !defined( SYS_BEOS )
+ if( setsockopt( i_handle, SOL_SOCKET, SO_RCVBUF, (void *) &i_opt, sizeof( i_opt ) ) == -1 )
{
-#ifdef HAVE_ERRNO_H
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Dbg( p_this, "cannot configure socket (SO_RCVBUF: %i)",
+ WSAGetLastError() );
+#else
msg_Dbg( p_this, "cannot configure socket (SO_RCVBUF: %s)",
strerror(errno));
-#else
- msg_Warn( p_this, "cannot configure socket (SO_RCVBUF)" );
#endif
}
+#endif
+#if !defined( SYS_BEOS )
/* Check if we really got what we have asked for, because Linux, etc.
* will silently limit the max buffer size to net.core.rmem_max which
* is typically only 65535 bytes */
i_opt = 0;
i_opt_size = sizeof( i_opt );
-#if defined( SYS_BEOS )
- if( getsockopt( i_handle, SOL_SOCKET, SO_NONBLOCK,
-#else
- if( getsockopt( i_handle, SOL_SOCKET, SO_RCVBUF,
-#endif
- (void*) &i_opt, &i_opt_size ) == -1 )
+ if( getsockopt( i_handle, SOL_SOCKET, SO_RCVBUF, (void*) &i_opt, &i_opt_size ) == -1 )
{
-#ifdef HAVE_ERRNO_H
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot query socket (SO_RCVBUF: %i)",
+ WSAGetLastError() );
+#else
msg_Warn( p_this, "cannot query socket (SO_RCVBUF: %s)",
strerror(errno) );
-#else
- msg_Warn( p_this, "cannot query socket (SO_RCVBUF)" );
#endif
}
else if( i_opt < 0x80000 )
msg_Dbg( p_this, "socket buffer size is 0x%x instead of 0x%x",
i_opt, 0x80000 );
}
+#endif
/* Build the local socket */
-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 ) || defined( UNDER_CE )
/* Under Win32 and for multicasting, we bind to INADDR_ANY,
* so let's call BuildAddr with "" instead of psz_bind_addr */
if( BuildAddr( &sock, IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) ?
/* Bind it */
if( bind( i_handle, (struct sockaddr *)&sock, sizeof( sock ) ) < 0 )
{
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_this, "cannot bind socket (%s)", strerror(errno) );
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot bind socket (%i)", WSAGetLastError() );
#else
- msg_Warn( p_this, "cannot bind socket" );
+ msg_Warn( p_this, "cannot bind socket (%s)", strerror(errno) );
#endif
close( i_handle );
return( -1 );
}
-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 ) || defined( UNDER_CE )
/* Restore the sock struct so we can spare a few #ifdef WIN32 later on */
if( IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) )
{
}
#endif
+#if !defined( SYS_BEOS )
/* Allow broadcast reception if we bound on INADDR_ANY */
if( !*psz_bind_addr )
{
i_opt = 1;
-#if defined( SYS_BEOS )
- if( setsockopt( i_handle, SOL_SOCKET, SO_NONBLOCK,
-#else
- if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
-#endif
- (void*) &i_opt, sizeof( i_opt ) ) == -1 )
+ if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST, (void*) &i_opt, sizeof( i_opt ) ) == -1 )
{
-#ifdef HAVE_ERRNO_H
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot configure socket (SO_BROADCAST: %i)",
+ WSAGetLastError() );
+#else
msg_Warn( p_this, "cannot configure socket (SO_BROADCAST: %s)",
strerror(errno) );
-#else
- msg_Warn( p_this, "cannot configure socket (SO_BROADCAST)" );
#endif
}
}
+#endif
-#if !defined( UNDER_CE ) && !defined( SYS_BEOS )
+#if !defined( SYS_BEOS )
/* Join the multicast group if the socket is a multicast address */
if( IN_MULTICAST( ntohl(sock.sin_addr.s_addr) ) )
{
- struct ip_mreq imr;
-
/* Determine interface to be used for multicast */
char * psz_if_addr = config_GetPsz( p_this, "iface-addr" );
- imr.imr_multiaddr.s_addr = sock.sin_addr.s_addr;
- if( psz_if_addr != NULL && *psz_if_addr
- && inet_addr(psz_if_addr) != INADDR_NONE )
- {
- imr.imr_interface.s_addr = inet_addr(psz_if_addr);
- }
- else
- {
- imr.imr_interface.s_addr = INADDR_ANY;
- }
- if( psz_if_addr != NULL ) free( psz_if_addr );
- /* Join Multicast group */
- if( setsockopt( i_handle, IPPROTO_IP, IP_ADD_MEMBERSHIP,
- (char*)&imr, sizeof(struct ip_mreq) ) == -1 )
+ /* If we have a source address, we use IP_ADD_SOURCE_MEMBERSHIP
+ so that IGMPv3 aware OSes running on IGMPv3 aware networks
+ will do an IGMPv3 query on the network */
+ if( *psz_server_addr )
{
-#ifdef HAVE_ERRNO_H
- msg_Err( p_this, "failed to join IP multicast group (%s)",
- strerror(errno) );
+ struct ip_mreq_source imr;
+
+ imr.imr_multiaddr.s_addr = sock.sin_addr.s_addr;
+ imr.imr_sourceaddr.s_addr = inet_addr(psz_server_addr);
+
+ if( psz_if_addr != NULL && *psz_if_addr
+ && inet_addr(psz_if_addr) != INADDR_NONE )
+ {
+ imr.imr_interface.s_addr = inet_addr(psz_if_addr);
+ }
+ else
+ {
+ imr.imr_interface.s_addr = INADDR_ANY;
+ }
+ if( psz_if_addr != NULL ) free( psz_if_addr );
+
+ msg_Dbg( p_this, "IP_ADD_SOURCE_MEMBERSHIP multicast request" );
+ /* Join Multicast group with source filter */
+ if( setsockopt( i_handle, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP,
+ (char*)&imr,
+ sizeof(struct ip_mreq_source) ) == -1 )
+ {
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Err( p_this, "failed to join IP multicast group (%i)",
+ WSAGetLastError() );
#else
- msg_Err( p_this, "failed to join IP multicast group" );
+ msg_Err( p_this, "failed to join IP multicast group (%s)",
+ strerror(errno) );
#endif
- close( i_handle );
- return( -1 );
- }
+ msg_Err( p_this, "are you sure your OS supports IGMPv3?" );
+ close( i_handle );
+ return( -1 );
+ }
+ }
+ /* If there is no source address, we use IP_ADD_MEMBERSHIP */
+ else
+ {
+ struct ip_mreq imr;
+
+ imr.imr_multiaddr.s_addr = sock.sin_addr.s_addr;
+ if( psz_if_addr != NULL && *psz_if_addr
+ && inet_addr(psz_if_addr) != INADDR_NONE )
+ {
+ imr.imr_interface.s_addr = inet_addr(psz_if_addr);
+ }
+ else
+ {
+ imr.imr_interface.s_addr = INADDR_ANY;
+ }
+ if( psz_if_addr != NULL ) free( psz_if_addr );
+
+ msg_Dbg( p_this, "IP_ADD_MEMBERSHIP multicast request" );
+ /* Join Multicast group without source filter */
+ if( setsockopt( i_handle, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+ (char*)&imr, sizeof(struct ip_mreq) ) == -1 )
+ {
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Err( p_this, "failed to join IP multicast group (%i)",
+ WSAGetLastError() );
+#else
+ msg_Err( p_this, "failed to join IP multicast group (%s)",
+ strerror(errno) );
+#endif
+ close( i_handle );
+ return( -1 );
+ }
+ }
}
-#endif /* UNDER_CE, SYS_BEOS */
+#endif
if( *psz_server_addr )
{
if( connect( i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_this, "cannot connect socket (%s)", strerror(errno) );
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot connect socket (%i)", WSAGetLastError());
#else
- msg_Warn( p_this, "cannot connect socket" );
+ msg_Warn( p_this, "cannot connect socket (%s)", strerror(errno) );
#endif
close( i_handle );
return( -1 );
}
-#if !defined( UNDER_CE ) && !defined( SYS_BEOS )
+#if !defined( SYS_BEOS )
if( IN_MULTICAST( ntohl(inet_addr(psz_server_addr) ) ) )
{
/* set the time-to-live */
- int ttl = p_socket->i_ttl;
- if( ttl < 1 )
+ int i_ttl = p_socket->i_ttl;
+ unsigned char ttl;
+
+ /* set the multicast interface */
+ char * psz_mif_addr = config_GetPsz( p_this, "miface-addr" );
+ if( psz_mif_addr )
{
- ttl = config_GetInt( p_this, "ttl" );
+ struct in_addr intf;
+ intf.s_addr = inet_addr(psz_mif_addr);
+ free( psz_mif_addr );
+
+ if( setsockopt( i_handle, IPPROTO_IP, IP_MULTICAST_IF,
+ &intf, sizeof( intf ) ) < 0 )
+ {
+ msg_Dbg( p_this, "failed to set multicast interface (%s).", strerror(errno) );
+ close( i_handle );
+ return ( -1 );
+ }
}
- if( ttl < 1 ) ttl = 1;
+ if( i_ttl < 1 )
+ {
+ if( var_Get( p_this, "ttl", &val ) != VLC_SUCCESS )
+ {
+ var_Create( p_this, "ttl",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ttl", &val );
+ }
+ i_ttl = val.i_int;
+ }
+ if( i_ttl < 1 ) i_ttl = 1;
+ ttl = (unsigned char) i_ttl;
+
+ /* There is some confusion in the world whether IP_MULTICAST_TTL
+ * takes a byte or an int as an argument.
+ * BSD seems to indicate byte so we are going with that and use
+ * int as a fallback to be safe */
if( setsockopt( i_handle, IPPROTO_IP, IP_MULTICAST_TTL,
- (void *) &ttl, sizeof( ttl ) ) < 0 )
+ &ttl, sizeof( ttl ) ) < 0 )
{
-#ifdef HAVE_ERRNO_H
- msg_Err( p_this, "failed to set ttl (%s)", strerror(errno) );
-#else
- msg_Err( p_this, "failed to set ttl" );
-#endif
- close( i_handle );
- return( -1 );
+ msg_Dbg( p_this, "failed to set ttl (%s). Let's try it "
+ "the integer way.", strerror(errno) );
+ if( setsockopt( i_handle, IPPROTO_IP, IP_MULTICAST_TTL,
+ &i_ttl, sizeof( i_ttl ) ) <0 )
+ {
+ msg_Err( p_this, "failed to set ttl (%s)",
+ strerror(errno) );
+ close( i_handle );
+ return( -1 );
+ }
}
}
-#endif /* UNDER_CE, SYS_BEOS */
+#endif
}
p_socket->i_handle = i_handle;
- p_socket->i_mtu = config_GetInt( p_this, "mtu" );
+
+ if( var_Get( p_this, "mtu", &val ) != VLC_SUCCESS )
+ {
+ var_Create( p_this, "mtu", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "mtu", &val );
+ }
+ p_socket->i_mtu = val.i_int;
return( 0 );
}
+/*****************************************************************************
+ * SocketTCP: create a TCP socket
+ *****************************************************************************
+ * This function returns -1 in case of error.
+ *****************************************************************************/
+static int SocketTCP( vlc_object_t * p_this )
+{
+ int i_handle;
+
+ /* Open a SOCK_STREAM (TCP) socket, in the PF_INET domain, automatic (0)
+ * protocol */
+ if( (i_handle = socket( PF_INET, SOCK_STREAM, 0 )) == -1 )
+ {
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot create socket (%i)", WSAGetLastError() );
+#else
+ msg_Warn( p_this, "cannot create socket (%s)", strerror(errno) );
+#endif
+ return -1;
+ }
+
+ /* Set to non-blocking */
+#if defined( WIN32 ) || defined( UNDER_CE )
+ {
+ unsigned long i_dummy = 1;
+ if( ioctlsocket( i_handle, FIONBIO, &i_dummy ) != 0 )
+ {
+ msg_Err( p_this, "cannot set socket to non-blocking mode" );
+ }
+ }
+#else
+ {
+ int i_flags;
+ if( ( i_flags = fcntl( i_handle, F_GETFL, 0 ) ) < 0 ||
+ fcntl( i_handle, F_SETFL, i_flags | O_NONBLOCK ) < 0 )
+ {
+ msg_Err( p_this, "cannot set socket to non-blocking mode" );
+ }
+ }
+#endif
+
+ return i_handle;
+}
+
/*****************************************************************************
* OpenTCP: open a TCP socket
*****************************************************************************
i_server_port = 80;
}
- /* Open a SOCK_STREAM (TCP) socket, in the AF_INET domain, automatic (0)
- * protocol */
- if( (i_handle = socket( AF_INET, SOCK_STREAM, 0 )) == -1 )
+ if( (i_handle = SocketTCP( p_this )) == -1 )
+ return VLC_EGENERIC;
+
+ /* Build remote address */
+ if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
{
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_this, "cannot create socket (%s)", strerror(errno) );
+ msg_Dbg( p_this, "could not build local address" );
+ goto error;
+ }
+
+ /* Connect the socket */
+ if( connect( i_handle, (struct sockaddr *) &sock, sizeof( sock ) ) == -1 )
+ {
+#if defined( WIN32 ) || defined( UNDER_CE )
+ if( WSAGetLastError() == WSAEWOULDBLOCK )
#else
- msg_Warn( p_this, "cannot create socket" );
+ if( errno == EINPROGRESS )
#endif
- return( -1 );
+ {
+ int i_ret, i_opt, i_opt_size = sizeof( i_opt ), i_max_count;
+ struct timeval timeout;
+ vlc_value_t val;
+ fd_set fds;
+
+ if( var_Get( p_this, "ipv4-timeout", &val ) != VLC_SUCCESS )
+ {
+ var_Create( p_this, "ipv4-timeout",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, "ipv4-timeout", &val );
+ }
+ i_max_count = val.i_int * 1000 / 100000 /* timeout.tv_usec */;
+
+ msg_Dbg( p_this, "connection in progress" );
+ do
+ {
+ if( p_this->b_die || i_max_count <= 0 )
+ {
+ msg_Dbg( p_this, "connection aborted" );
+ goto error;
+ }
+
+ i_max_count--;
+
+ /* Initialize file descriptor set */
+ FD_ZERO( &fds );
+ FD_SET( i_handle, &fds );
+
+ /* We'll wait 0.1 second if nothing happens */
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 100000;
+
+ } while( ( i_ret = select( i_handle + 1, NULL, &fds, NULL,
+ &timeout ) ) == 0 ||
+#if defined( WIN32 ) || defined( UNDER_CE )
+ ( i_ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK ) );
+#else
+ ( i_ret < 0 && errno == EINTR ) );
+#endif
+
+ if( i_ret < 0 )
+ {
+ msg_Warn( p_this, "cannot connect socket (select failed)" );
+ goto error;
+ }
+
+#if !defined( SYS_BEOS ) && !defined( UNDER_CE )
+ if( getsockopt( i_handle, SOL_SOCKET, SO_ERROR, (void*)&i_opt,
+ &i_opt_size ) == -1 || i_opt != 0 )
+ {
+ msg_Warn( p_this, "cannot connect socket (SO_ERROR)" );
+ goto error;
+ }
+#endif
+ }
+ else
+ {
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Warn( p_this, "cannot connect socket (%i)", WSAGetLastError());
+#else
+ msg_Warn( p_this, "cannot connect socket (%s)", strerror(errno) );
+#endif
+ goto error;
+ }
+ }
+
+ p_socket->i_handle = i_handle;
+ p_socket->i_mtu = 0; /* There is no MTU notion in TCP */
+ return VLC_SUCCESS;
+
+error:
+ close( i_handle );
+ return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * ListenTCP: open a TCP passive socket (server-side)
+ *****************************************************************************
+ * psz_server_addr, i_server_port : address and port used for the bind()
+ * system call. If i_server_port == 0, 80 is used.
+ * Other parameters are ignored.
+ * This function returns -1 in case of error.
+ *****************************************************************************/
+static int ListenTCP( vlc_object_t * p_this, network_socket_t * p_socket )
+{
+ char * psz_server_addr = p_socket->psz_server_addr;
+ int i_server_port = p_socket->i_server_port;
+
+ int i_handle, i_dummy = 1;
+ struct sockaddr_in sock;
+
+ if( (i_handle = SocketTCP( p_this )) == -1 )
+ return VLC_EGENERIC;
+
+ if ( setsockopt( i_handle, SOL_SOCKET, SO_REUSEADDR,
+ (void *)&i_dummy, sizeof( i_dummy ) ) == -1 )
+ {
+ msg_Warn( p_this, "cannot configure socket (SO_REUSEADDR)" );
}
/* Build remote address */
if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
{
msg_Dbg( p_this, "could not build local address" );
- close( i_handle );
- return( -1 );
+ return VLC_EGENERIC;
}
-
- /* Connect the socket */
- if( connect( i_handle, (struct sockaddr *) &sock,
- sizeof( sock ) ) == (-1) )
+
+ /* Bind the socket */
+ if( bind( i_handle, (struct sockaddr *) &sock, sizeof( sock )) == -1 )
{
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_this, "cannot connect socket (%s)", strerror(errno) );
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Err( p_this, "cannot bind socket (%i)", WSAGetLastError());
#else
- msg_Warn( p_this, "cannot connect socket" );
+ msg_Err( p_this, "cannot bind socket (%s)", strerror(errno) );
#endif
- close( i_handle );
- return( -1 );
+ goto error;
+ }
+
+ /* Listen */
+ if( listen( i_handle, 100 ) == -1 )
+ {
+#if defined(WIN32) || defined(UNDER_CE)
+ msg_Err( p_this, "cannot bring socket in listening mode (%i)",
+ WSAGetLastError());
+#else
+ msg_Err( p_this, "cannot bring the socket in listening mode (%s)",
+ strerror(errno) );
+#endif
+ goto error;
}
p_socket->i_handle = i_handle;
p_socket->i_mtu = 0; /* There is no MTU notion in TCP */
+ return VLC_SUCCESS;
- return( 0 );
+error:
+ close( i_handle );
+ return VLC_EGENERIC;
}
/*****************************************************************************
- * NetOpen: wrapper around OpenUDP and OpenTCP
+ * NetOpen: wrapper around OpenUDP, ListenTCP and OpenTCP
*****************************************************************************/
static int NetOpen( vlc_object_t * p_this )
{
{
return OpenUDP( p_this, p_socket );
}
+ else if( p_socket->i_type == NETWORK_TCP_PASSIVE )
+ {
+ return ListenTCP( p_this, p_socket );
+ }
else
{
return OpenTCP( p_this, p_socket );
projects / vlc / blobdiff