X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fudp.c;h=b98a9116f868b2e404eed725ff31f6f5e4ff20f4;hb=436b59c583a0e3315b2a94246cbdff3a607ff097;hp=b7801b854fc719699a1ca9adf780409406a21cef;hpb=9a5db9e20c642201ac9d3474a8c62188b81c9105;p=vlc diff --git a/modules/access/udp.c b/modules/access/udp.c index b7801b854f..b98a9116f8 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -1,17 +1,20 @@ /***************************************************************************** - * udp.c: raw UDP & RTP access plug-in + * udp.c: raw UDP & RTP input module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: udp.c,v 1.11 2003/02/04 10:07:40 massiot Exp $ + * Copyright (C) 2001-2004 VideoLAN + * $Id$ * * Authors: Christophe Massiot * Tristan Leteurtre + * Laurent Aimar + * + * Reviewed: 23 October 2003, Jean-Paul Saman * * 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 * (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 @@ -26,61 +29,36 @@ * Preamble *****************************************************************************/ #include -#include -#include -#include -#include -#include #include #include -#ifdef HAVE_SYS_TIME_H -# include -#endif - -#ifdef HAVE_UNISTD_H -# include -#elif defined( _MSC_VER ) && defined( _WIN32 ) -# include -#endif - -#ifdef WIN32 -# include -# include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif -#else -# include -#endif - #include "network.h" -#define RTP_HEADER_LEN 12 - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); -static ssize_t Read ( input_thread_t *, byte_t *, size_t ); -static ssize_t RTPRead ( input_thread_t *, byte_t *, size_t ); -static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t ); - /***************************************************************************** * Module descriptor *****************************************************************************/ -#define CACHING_TEXT N_("caching value in ms") +#define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for udp streams. This " \ - "value should be set in miliseconds units." ) + "Allows you to modify the default caching value for UDP streams. This " \ + "value should be set in millisecond units." ) + +#define AUTO_MTU_TEXT N_("Autodetection of MTU") +#define AUTO_MTU_LONGTEXT N_( \ + "Allows growing the MTU if truncated packets are found" ) + +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("raw UDP access module") ); - add_category_hint( N_("udp"), NULL ); - add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT ); - set_capability( "access", 0 ); + set_description( _("UDP/RTP input") ); + + add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, + CACHING_LONGTEXT, VLC_TRUE ); + add_bool( "udp-auto-mtu", 1, NULL, + AUTO_MTU_TEXT, AUTO_MTU_LONGTEXT, VLC_TRUE ); + + set_capability( "access2", 0 ); add_shortcut( "udp" ); add_shortcut( "udpstream" ); add_shortcut( "udp4" ); @@ -91,49 +69,72 @@ vlc_module_begin(); set_callbacks( Open, Close ); vlc_module_end(); +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +#define RTP_HEADER_LEN 12 + +static block_t *BlockUDP( access_t * ); +static block_t *BlockRTP( access_t * ); +static block_t *BlockChoose( access_t * ); +static int Control( access_t *, int, va_list ); + +struct access_sys_t +{ + int fd; + + int i_mtu; + vlc_bool_t b_auto_mtu; +}; + /***************************************************************************** * Open: open the socket *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - input_thread_t * p_input = (input_thread_t *)p_this; - input_socket_t * p_access_data; - module_t * p_network; - char * psz_network = ""; - char * psz_name = strdup(p_input->psz_name); - char * psz_parser = psz_name; - char * psz_server_addr = ""; - char * psz_server_port = ""; - char * psz_bind_addr = ""; - char * psz_bind_port = ""; - int i_bind_port = 0, i_server_port = 0; - network_socket_t socket_desc; - - if( config_GetInt( p_input, "ipv4" ) ) - { - psz_network = "ipv4"; - } - if( config_GetInt( p_input, "ipv6" ) ) - { - psz_network = "ipv6"; - } + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; + + char *psz_name = strdup( p_access->psz_path ); + char *psz_parser = psz_name; + char *psz_server_addr = ""; + char *psz_server_port = ""; + char *psz_bind_addr = ""; + char *psz_bind_port = ""; + int i_bind_port = 0; + int i_server_port = 0; - if( *p_input->psz_access ) + + /* First set ipv4/ipv6 */ + var_Create( p_access, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_access, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + + if( *p_access->psz_access ) { + vlc_value_t val; /* Find out which shortcut was used */ - if( !strncmp( p_input->psz_access, "udp6", 5 ) ) + if( !strncmp( p_access->psz_access, "udp4", 6 ) || + !strncmp( p_access->psz_access, "rtp4", 6 )) { - psz_network = "ipv6"; + val.b_bool = VLC_TRUE; + var_Set( p_access, "ipv4", val ); + + val.b_bool = VLC_FALSE; + var_Set( p_access, "ipv6", val ); } - else if( !strncmp( p_input->psz_access, "udp4", 5 ) ) + else if( !strncmp( p_access->psz_access, "udp6", 6 ) || + !strncmp( p_access->psz_access, "rtp6", 6 ) ) { - psz_network = "ipv4"; + val.b_bool = VLC_TRUE; + var_Set( p_access, "ipv6", val ); + + val.b_bool = VLC_FALSE; + var_Set( p_access, "ipv4", val ); } } /* Parse psz_name syntax : * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */ - if( *psz_parser && *psz_parser != '@' ) { /* Found server */ @@ -155,8 +156,7 @@ static int Open( vlc_object_t *p_this ) if( *psz_parser == ':' ) { /* Found server port */ - *psz_parser = '\0'; /* Terminate server name */ - psz_parser++; + *psz_parser++ = '\0'; /* Terminate server name */ psz_server_port = psz_parser; while( *psz_parser && *psz_parser != '@' ) @@ -169,8 +169,7 @@ static int Open( vlc_object_t *p_this ) if( *psz_parser == '@' ) { /* Found bind address or bind port */ - *psz_parser = '\0'; /* Terminate server port or name if necessary */ - psz_parser++; + *psz_parser++ = '\0'; /* Terminate server port or name if necessary */ if( *psz_parser && *psz_parser != ':' ) { @@ -194,103 +193,55 @@ static int Open( vlc_object_t *p_this ) if( *psz_parser == ':' ) { /* Found bind port */ - *psz_parser = '\0'; /* Terminate bind address if necessary */ - psz_parser++; - + *psz_parser++ = '\0'; /* Terminate bind address if necessary */ psz_bind_port = psz_parser; } } - /* Convert ports format */ - if( *psz_server_port ) - { - i_server_port = strtol( psz_server_port, &psz_parser, 10 ); - if( *psz_parser ) - { - msg_Err( p_input, "cannot parse server port near %s", psz_parser ); - free(psz_name); - return( -1 ); - } - } - - if( *psz_bind_port ) - { - i_bind_port = strtol( psz_bind_port, &psz_parser, 10 ); - if( *psz_parser ) - { - msg_Err( p_input, "cannot parse bind port near %s", psz_parser ); - free(psz_name); - return( -1 ); - } - } - - if( i_bind_port == 0 ) + i_server_port = strtol( psz_server_port, NULL, 10 ); + if( ( i_bind_port = strtol( psz_bind_port, NULL, 10 ) ) == 0 ) { - i_bind_port = config_GetInt( p_this, "server-port" ); + i_bind_port = var_CreateGetInteger( p_access, "server-port" ); } - p_input->pf_read = RTPChoose; - 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 = 0; - p_input->stream.b_seekable = 0; - p_input->stream.b_connected = 0; - p_input->stream.p_selected_area->i_tell = 0; - p_input->stream.i_method = INPUT_METHOD_NETWORK; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - if( *psz_server_addr || i_server_port ) - { - msg_Err( p_input, "this UDP syntax is deprecated; the server argument will be"); - msg_Err( p_input, "ignored (%s:%d). If you wanted to enter a multicast address", - psz_server_addr, i_server_port); - msg_Err( p_input, "or local port, type : %s:@%s:%d", - *p_input->psz_access ? p_input->psz_access : "udp", - psz_server_addr, i_server_port ); - - i_server_port = 0; - psz_server_addr = ""; - } - - msg_Dbg( p_input, "opening server=%s:%d local=%s:%d", + msg_Dbg( p_access, "opening server=%s:%d local=%s:%d", psz_server_addr, i_server_port, psz_bind_addr, i_bind_port ); - /* Prepare the network_socket_t structure */ - socket_desc.i_type = NETWORK_UDP; - socket_desc.psz_bind_addr = psz_bind_addr; - socket_desc.i_bind_port = i_bind_port; - socket_desc.psz_server_addr = psz_server_addr; - socket_desc.i_server_port = i_server_port; - - /* Find an appropriate network module */ - p_input->p_private = (void*) &socket_desc; - p_network = module_Need( p_input, "network", psz_network ); - free(psz_name); - if( p_network == NULL ) + /* Set up p_access */ + p_access->pf_read = NULL; + p_access->pf_block = BlockChoose; + p_access->pf_control = Control; + p_access->pf_seek = NULL; + p_access->info.i_update = 0; + p_access->info.i_size = 0; + p_access->info.i_pos = 0; + p_access->info.b_eof = VLC_FALSE; + p_access->info.i_title = 0; + p_access->info.i_seekpoint = 0; + + p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + p_sys->fd = net_OpenUDP( p_access, psz_bind_addr, i_bind_port, + psz_server_addr, i_server_port ); + if( p_sys->fd < 0 ) { - return( -1 ); + msg_Err( p_access, "cannot open socket" ); + free( psz_name ); + free( p_sys ); + return VLC_EGENERIC; } - module_Unneed( p_input, p_network ); - - p_access_data = malloc( sizeof(input_socket_t) ); - p_input->p_access_data = (access_sys_t *)p_access_data; + free( psz_name ); - if( p_access_data == NULL ) - { - msg_Err( p_input, "out of memory" ); - return( -1 ); - } + /* FIXME */ + p_sys->i_mtu = var_CreateGetInteger( p_access, "mtu" ); + if( p_sys->i_mtu <= 1 ) + p_sys->i_mtu = 1500; /* Avoid problem */ - p_access_data->i_handle = socket_desc.i_handle; - p_input->i_mtu = socket_desc.i_mtu; + p_sys->b_auto_mtu = var_CreateGetBool( p_access, "udp-auto-mtu" );; /* Update default_pts to a suitable value for udp access */ - p_input->i_pts_delay = config_GetInt( p_input, "udp-caching" ) * 1000; + var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - return( 0 ); + return VLC_SUCCESS; } /***************************************************************************** @@ -298,195 +249,201 @@ 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; - input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; - - msg_Info( p_input, "closing UDP target `%s'", p_input->psz_source ); - -#ifdef UNDER_CE - CloseHandle( (HANDLE)p_access_data->i_handle ); -#elif defined( WIN32 ) - closesocket( p_access_data->i_handle ); -#else - close( p_access_data->i_handle ); -#endif + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys = p_access->p_sys; - free( p_access_data ); + net_Close( p_sys->fd ); + free( p_sys ); } /***************************************************************************** - * Read: read on a file descriptor, checking b_die periodically + * Control: *****************************************************************************/ -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +static int Control( access_t *p_access, int i_query, va_list args ) { -#ifdef UNDER_CE - return -1; + access_sys_t *p_sys = p_access->p_sys; + vlc_bool_t *pb_bool; + int *pi_int; + int64_t *pi_64; -#else - input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; - struct timeval timeout; - fd_set fds; - int i_ret; - - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( p_access_data->i_handle, &fds ); - - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + switch( i_query ) + { + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = VLC_FALSE; + break; + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = p_sys->i_mtu; + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = var_GetInteger( p_access, "udp-caching" ) * 1000; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + case ACCESS_GET_TITLE_INFO: + case ACCESS_SET_TITLE: + case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + return VLC_EGENERIC; + + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; - /* Find if some data is available */ - i_ret = select( p_access_data->i_handle + 1, &fds, - NULL, NULL, &timeout ); + } + return VLC_SUCCESS; +} - if( i_ret == -1 && errno != EINTR ) +/***************************************************************************** + * BlockUDP: + *****************************************************************************/ +static block_t *BlockUDP( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; + block_t *p_block; + + /* Read data */ + p_block = block_New( p_access, p_sys->i_mtu ); + p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL, + p_block->p_buffer, p_sys->i_mtu, + VLC_FALSE ); + if( p_block->i_buffer <= 0 ) { - msg_Err( p_input, "network select error (%s)", strerror(errno) ); + block_Release( p_block ); + return NULL; } - else if( i_ret > 0 ) - { - ssize_t i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 ); - - if( i_recv < 0 ) - { - msg_Err( p_input, "recv failed (%s)", strerror(errno) ); - } - return i_recv; + if( p_block->i_buffer >= p_sys->i_mtu && p_sys->b_auto_mtu && + p_sys->i_mtu < 32767 ) + { + /* Increase by 100% */ + p_sys->i_mtu *= 2; + msg_Dbg( p_access, "increasing MTU to %d", p_sys->i_mtu ); } - return 0; - -#endif + return p_block; } /***************************************************************************** - * RTPRead : read from the network, and parse the RTP header + * BlockParseRTP/BlockRTP: *****************************************************************************/ -static ssize_t RTPRead( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *BlockParseRTP( access_t *p_access, block_t *p_block ) { - int i_rtp_version; - int i_CSRC_count; - int i_payload_type; - - byte_t * p_tmp_buffer = alloca( p_input->i_mtu ); - - /* Get the raw data from the socket. - * We first assume that RTP header size is the classic RTP_HEADER_LEN. */ - ssize_t i_ret = Read( p_input, p_tmp_buffer, p_input->i_mtu ); + int i_rtp_version; + int i_CSRC_count; + int i_payload_type; + int i_skip = 0; - if ( !i_ret ) return 0; + if( p_block->i_buffer < RTP_HEADER_LEN ) + goto trash; /* Parse the header and make some verifications. * See RFC 1889 & RFC 2250. */ - - i_rtp_version = ( p_tmp_buffer[0] & 0xC0 ) >> 6; - i_CSRC_count = ( p_tmp_buffer[0] & 0x0F ); - i_payload_type = ( p_tmp_buffer[1] & 0x7F ); + i_rtp_version = ( p_block->p_buffer[0] & 0xC0 ) >> 6; + i_CSRC_count = ( p_block->p_buffer[0] & 0x0F ); + i_payload_type = ( p_block->p_buffer[1] & 0x7F ); if ( i_rtp_version != 2 ) - msg_Dbg( p_input, "RTP version is %u, should be 2", i_rtp_version ); + msg_Dbg( p_access, "RTP version is %u, should be 2", i_rtp_version ); + + if( i_payload_type == 14 ) + i_skip = 4; + else if( i_payload_type != 33 && i_payload_type != 32 ) + msg_Dbg( p_access, "unsupported RTP payload type (%u)", i_payload_type ); + + i_skip += RTP_HEADER_LEN + 4*i_CSRC_count; - if ( i_payload_type != 33 && i_payload_type != 14 - && i_payload_type != 32 ) - msg_Dbg( p_input, "unsupported RTP payload type (%u)", i_payload_type ); + /* A CSRC extension field is 32 bits in size (4 bytes) */ + if( i_skip >= p_block->i_buffer ) + goto trash; /* Return the packet without the RTP header. */ - i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count ); + p_block->i_buffer -= i_skip; + p_block->p_buffer += i_skip; - if ( (size_t)i_ret > i_len ) - { - /* This should NOT happen. */ - msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len ); - i_ret = i_len; - } + return p_block; - p_input->p_vlc->pf_memcpy( p_buffer, - p_tmp_buffer + RTP_HEADER_LEN + 4 * i_CSRC_count, - i_ret ); +trash: + msg_Warn( p_access, "received a too short packet for RTP" ); + block_Release( p_block ); + return NULL; +} - return i_ret; +static block_t *BlockRTP( access_t *p_access ) +{ + return BlockParseRTP( p_access, BlockUDP( p_access ) ); } /***************************************************************************** - * RTPChoose : read from the network, and decide whether it's UDP or RTP + * BlockChoose: decide between RTP and UDP *****************************************************************************/ -static ssize_t RTPChoose( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *BlockChoose( access_t *p_access ) { - int i_rtp_version; - int i_CSRC_count; - int i_payload_type; - - byte_t * p_tmp_buffer = alloca( p_input->i_mtu ); + block_t *p_block; + int i_rtp_version; + int i_CSRC_count; + int i_payload_type; - /* Get the raw data from the socket. - * We first assume that RTP header size is the classic RTP_HEADER_LEN. */ - ssize_t i_ret = Read( p_input, p_tmp_buffer, p_input->i_mtu ); + if( ( p_block = BlockUDP( p_access ) ) == NULL ) + return NULL; - if ( !i_ret ) return 0; - - /* Check that it's not TS. */ - if ( p_tmp_buffer[0] == 0x47 ) + if( p_block->p_buffer[0] == 0x47 ) { - msg_Dbg( p_input, "detected TS over raw UDP" ); - p_input->pf_read = Read; - p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret ); - return i_ret; + msg_Dbg( p_access, "detected TS over raw UDP" ); + p_access->pf_block = BlockUDP; + return p_block; } + if( p_block->i_buffer < RTP_HEADER_LEN ) + return p_block; + /* Parse the header and make some verifications. * See RFC 1889 & RFC 2250. */ - i_rtp_version = ( p_tmp_buffer[0] & 0xC0 ) >> 6; - i_CSRC_count = ( p_tmp_buffer[0] & 0x0F ); - i_payload_type = ( p_tmp_buffer[1] & 0x7F ); - - if ( i_rtp_version != 2 ) - { - msg_Dbg( p_input, "no RTP header detected" ); - p_input->pf_read = Read; - p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret ); - return i_ret; - } + i_rtp_version = ( p_block->p_buffer[0] & 0xC0 ) >> 6; + i_CSRC_count = ( p_block->p_buffer[0] & 0x0F ); + i_payload_type = ( p_block->p_buffer[1] & 0x7F ); - switch ( i_payload_type ) + if( i_rtp_version != 2 ) { - case 33: - msg_Dbg( p_input, "detected TS over RTP" ); - break; - - case 14: - msg_Dbg( p_input, "detected MPEG audio over RTP" ); - break; - - case 32: - msg_Dbg( p_input, "detected MPEG video over RTP" ); - break; - - default: - msg_Dbg( p_input, "no RTP header detected" ); - p_input->pf_read = Read; - p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret ); - return i_ret; + msg_Dbg( p_access, "no supported RTP header detected" ); + p_access->pf_block = BlockUDP; + return p_block; } - /* Return the packet without the RTP header. */ - p_input->pf_read = RTPRead; - i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count ); - - if ( (size_t)i_ret > i_len ) + switch( i_payload_type ) { - /* This should NOT happen. */ - msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len ); - i_ret = i_len; + case 33: + msg_Dbg( p_access, "detected TS over RTP" ); + p_access->psz_demux = strdup( "ts" ); + break; + + case 14: + msg_Dbg( p_access, "detected MPEG audio over RTP" ); + p_access->psz_demux = strdup( "mp3" ); + break; + + case 32: + msg_Dbg( p_access, "detected MPEG video over RTP" ); + p_access->psz_demux = strdup( "es" ); + break; + + default: + msg_Dbg( p_access, "no RTP header detected" ); + p_access->pf_block = BlockUDP; + return p_block; } - p_input->p_vlc->pf_memcpy( p_buffer, - p_tmp_buffer + RTP_HEADER_LEN + 4 * i_CSRC_count, - i_ret ); + p_access->pf_block = BlockRTP; - return i_ret; + return BlockParseRTP( p_access, p_block ); }