X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ftcp.c;h=7b111f0ca055c7d77c1d4450cf569626e1e91365;hb=96f479ec390681b428e63e900cbfa4274004ef4e;hp=e5b31ee3161d351fd49ac6fd88a0fb3e6ce906b2;hpb=4b9f4ff644a2bec2461a882fb4e064195cf19b2d;p=vlc diff --git a/modules/access/tcp.c b/modules/access/tcp.c index e5b31ee316..7b111f0ca0 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -1,7 +1,7 @@ /***************************************************************************** * tcp.c: TCP input module ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,95 +18,101 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "network.h" +#include +#include +#include + +#include /***************************************************************************** * Module descriptor *****************************************************************************/ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for TCP streams. This " \ - "value should be set in millisecond units." ) + "Caching value for TCP streams. This " \ + "value should be set in milliseconds." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( _("TCP input") ); +vlc_module_begin () + set_shortname( N_("TCP") ) + set_description( N_("TCP input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ) + change_safe() - set_capability( "access", 0 ); - add_shortcut( "tcp" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access", 0 ) + add_shortcut( "tcp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ struct access_sys_t { - int fd; + int fd; }; -static ssize_t Read ( input_thread_t *, byte_t *, size_t ); + +static ssize_t Read( access_t *, uint8_t *, size_t ); +static int Control( access_t *, int, va_list ); /***************************************************************************** * Open: open the socket *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - access_sys_t *p_sys; - - char *psz_dup = strdup(p_input->psz_name); - char *psz_parser = psz_dup; + access_t *p_access = (access_t *)p_this; + access_sys_t *p_sys; - vlc_value_t val; + char *psz_dup = strdup(p_access->psz_location); + char *psz_parser = psz_dup; /* Parse server:port */ - while( *psz_parser && *psz_parser != ':' ) + if( *psz_parser == '[' ) { - if( *psz_parser == '[' ) - { - /* IPV6 */ - while( *psz_parser && *psz_parser != ']' ) - { - psz_parser++; - } - } - psz_parser++; + psz_parser = strchr( psz_parser, ']' ); + if( psz_parser == NULL ) + psz_parser = psz_dup; } - if( *psz_parser != ':' || psz_parser == psz_dup ) + psz_parser = strchr( psz_parser, ':' ); + + if( psz_parser == NULL ) { - msg_Err( p_input, "you have to provide server:port addresse" ); + msg_Err( p_access, "missing port number : %s", psz_dup ); free( psz_dup ); return VLC_EGENERIC; } + *psz_parser++ = '\0'; - if( atoi( psz_parser ) <= 0 ) + /* Init p_access */ + access_InitFields( p_access ); + ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL ); + p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); + if( !p_sys ) { - msg_Err( p_input, "invalid port number (%d)", atoi( psz_parser ) ); free( psz_dup ); - return VLC_EGENERIC; + return VLC_ENOMEM; } - /* Connect */ - p_input->p_access_data = p_sys = malloc( sizeof( access_sys_t ) ); - p_sys->fd = net_OpenTCP( p_input, psz_dup, atoi( psz_parser ) ); + p_sys->fd = net_ConnectTCP( p_access, psz_dup, atoi( psz_parser ) ); free( psz_dup ); if( p_sys->fd < 0 ) @@ -115,23 +121,8 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - p_input->pf_read = Read; - p_input->pf_set_program = input_SetProgram; - p_input->pf_set_area = NULL; - p_input->pf_seek = NULL; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_pace_control = VLC_TRUE; /* FIXME ? */ - p_input->stream.b_seekable = 0; - p_input->stream.p_selected_area->i_tell = 0; - p_input->stream.i_method = INPUT_METHOD_NETWORK; - p_input->i_mtu = 0; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - /* Update default_pts to a suitable value for udp access */ - var_Create( p_input, "tcp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "tcp-caching", &val ); - p_input->i_pts_delay = val.i_int * 1000; + var_Create( p_access, "tcp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); return VLC_SUCCESS; } @@ -141,21 +132,80 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - access_sys_t *p_sys = p_input->p_access_data; - - msg_Info( p_input, "closing TCP target `%s'", p_input->psz_source ); + access_t *p_access = (access_t *)p_this; + access_sys_t *p_sys = p_access->p_sys; net_Close( p_sys->fd ); free( p_sys ); } /***************************************************************************** - * Read: read on a file descriptor, checking b_die periodically + * Read: read on a file descriptor *****************************************************************************/ -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { - access_sys_t *p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; + int i_read; + + if( p_access->info.b_eof ) + return 0; + + i_read = net_Read( p_access, p_sys->fd, NULL, p_buffer, i_len, + false ); + if( i_read == 0 ) + p_access->info.b_eof = true; + else if( i_read > 0 ) + p_access->info.i_pos += i_read; - return net_Read( p_input, p_sys->fd, p_buffer, i_len, VLC_FALSE ); + return i_read; +} + +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( access_t *p_access, int i_query, va_list args ) +{ + bool *pb_bool; + int64_t *pi_64; + + switch( i_query ) + { + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + case ACCESS_CAN_PAUSE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ + break; + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000); + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + /* Nothing to do */ + break; + + case ACCESS_GET_TITLE_INFO: + case ACCESS_SET_TITLE: + case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: + return VLC_EGENERIC; + + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; + + } + return VLC_SUCCESS; }