X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fudp.c;h=5a46d2a84569f90bc0455c8da0488f6bcba51312;hb=5ebacd11d10f9acc39afc0b3d41beb280eaac293;hp=99053f322f34d9f7bd32de4e96890391591eac5b;hpb=3d6ee48d4aacb1fbd5c2741b7b319a62a47009d9;p=vlc diff --git a/modules/access/udp.c b/modules/access/udp.c index 99053f322f..5a46d2a845 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -1,19 +1,23 @@ /***************************************************************************** - * udp.c: raw UDP & RTP access plug-in + * udp.c: raw UDP input module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: udp.c,v 1.26 2003/12/04 16:49:43 sam Exp $ + * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2007 Remi Denis-Courmont + * $Id$ * * Authors: Christophe Massiot * Tristan Leteurtre + * Laurent Aimar + * Jean-Paul Saman + * Remi Denis-Courmont * - * Reviewed: 23 October 2003, Jean-Paul Saman + * 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 @@ -21,279 +25,153 @@ * * 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 -#include -#include -#include - -#include -#include - -#ifdef HAVE_SYS_TIME_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#ifdef WIN32 -# include -# include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif -#else -# include -#endif +#include +#include +#include +#include -#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 ); +#define MTU 65535 /***************************************************************************** * 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." ) + "Caching value for UDP 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( _("UDP/RTP input") ); - add_category_hint( N_("UDP"), NULL , VLC_TRUE ); - add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + set_shortname( N_("UDP" ) ); + set_description( N_("UDP input") ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + + add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, + CACHING_LONGTEXT, true ); + add_obsolete_integer( "rtp-late" ); + add_obsolete_bool( "udp-auto-mtu" ); + set_capability( "access", 0 ); add_shortcut( "udp" ); add_shortcut( "udpstream" ); add_shortcut( "udp4" ); add_shortcut( "udp6" ); - add_shortcut( "rtp" ); - add_shortcut( "rtp4" ); - add_shortcut( "rtp6" ); + set_callbacks( Open, Close ); vlc_module_end(); +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +#define RTP_HEADER_LEN 12 + +static block_t *BlockUDP( access_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; - 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; - vlc_value_t val; - - 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; - if( *p_input->psz_access ) - { - /* Find out which shortcut was used */ - if( !strncmp( p_input->psz_access, "udp6", 5 ) ) - { - psz_network = "ipv6"; - } - else if( !strncmp( p_input->psz_access, "udp4", 5 ) ) - { - psz_network = "ipv4"; - } - } + char *psz_name = strdup( p_access->psz_path ); + char *psz_parser; + const char *psz_server_addr, *psz_bind_addr = ""; + int i_bind_port, i_server_port = 0; + int fam = AF_UNSPEC; + int fd; - /* Parse psz_name syntax : - * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */ + /* Set up p_access */ + access_InitFields( p_access ); + ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL ); + p_access->info.b_prebuffered = false; - if( *psz_parser && *psz_parser != '@' ) + if (strlen (p_access->psz_access) > 0) { - /* Found server */ - psz_server_addr = psz_parser; - - while( *psz_parser && *psz_parser != ':' && *psz_parser != '@' ) + switch (p_access->psz_access[strlen (p_access->psz_access) - 1]) { - if( *psz_parser == '[' ) - { - /* IPv6 address */ - while( *psz_parser && *psz_parser != ']' ) - { - psz_parser++; - } - } - psz_parser++; - } - - if( *psz_parser == ':' ) - { - /* Found server port */ - *psz_parser = '\0'; /* Terminate server name */ - psz_parser++; - psz_server_port = psz_parser; + case '4': + fam = AF_INET; + break; - while( *psz_parser && *psz_parser != '@' ) - { - psz_parser++; - } + case '6': + fam = AF_INET6; + break; } } - if( *psz_parser == '@' ) + i_bind_port = var_CreateGetInteger( p_access, "server-port" ); + + /* Parse psz_name syntax : + * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */ + psz_parser = strchr( psz_name, '@' ); + if( psz_parser != NULL ) { - /* Found bind address or bind port */ - *psz_parser = '\0'; /* Terminate server port or name if necessary */ - psz_parser++; + /* Found bind address and/or bind port */ + *psz_parser++ = '\0'; + psz_bind_addr = psz_parser; - if( *psz_parser && *psz_parser != ':' ) - { - /* Found bind address */ - psz_bind_addr = psz_parser; + if( psz_bind_addr[0] == '[' ) + /* skips bracket'd IPv6 address */ + psz_parser = strchr( psz_parser, ']' ); - while( *psz_parser && *psz_parser != ':' ) + if( psz_parser != NULL ) + { + psz_parser = strchr( psz_parser, ':' ); + if( psz_parser != NULL ) { - if( *psz_parser == '[' ) - { - /* IPv6 address */ - while( *psz_parser && *psz_parser != ']' ) - { - psz_parser++; - } - } - psz_parser++; + *psz_parser++ = '\0'; + i_bind_port = atoi( psz_parser ); } } - - if( *psz_parser == ':' ) - { - /* Found bind port */ - *psz_parser = '\0'; /* Terminate bind address if necessary */ - psz_parser++; - - 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 ); - } - } + psz_server_addr = psz_name; + psz_parser = ( psz_server_addr[0] == '[' ) + ? strchr( psz_name, ']' ) /* skips bracket'd IPv6 address */ + : psz_name; - if( *psz_bind_port ) + if( psz_parser != NULL ) { - i_bind_port = strtol( psz_bind_port, &psz_parser, 10 ); - if( *psz_parser ) + psz_parser = strchr( psz_parser, ':' ); + if( psz_parser != NULL ) { - msg_Err( p_input, "cannot parse bind port near %s", psz_parser ); - free(psz_name); - return( -1 ); + *psz_parser++ = '\0'; + i_server_port = atoi( psz_parser ); } } - if( i_bind_port == 0 ) - { - i_bind_port = config_GetInt( p_this, "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.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; - socket_desc.i_ttl = 0; - - /* 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 ) + fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port, + psz_server_addr, i_server_port, fam, IPPROTO_UDP ); + free (psz_name); + if( fd == -1 ) { - return( -1 ); + msg_Err( p_access, "cannot open socket" ); + 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; - - if( p_access_data == NULL ) - { - msg_Err( p_input, "out of memory" ); - return( -1 ); - } - - p_access_data->i_handle = socket_desc.i_handle; - p_input->i_mtu = socket_desc.i_mtu; + p_access->p_sys = (void *)(intptr_t)fd; /* Update default_pts to a suitable value for udp access */ - var_Create( p_input, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_input, "udp-caching", &val ); - p_input->i_pts_delay = val.i_int * 1000; - - return( 0 ); + var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + return VLC_SUCCESS; } /***************************************************************************** @@ -301,245 +179,79 @@ 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; + access_t *p_access = (access_t*)p_this; - 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 - - free( p_access_data ); + net_Close( (intptr_t)p_access->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; - -#else - input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; - struct timeval timeout; - fd_set fds; - ssize_t i_recv; - 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; - - /* Find if some data is available */ - while( ((i_ret = select( p_access_data->i_handle + 1, &fds, - NULL, NULL, &timeout )) == 0) - || ((i_ret < 0) && (errno == EINTR)) ) - { - FD_ZERO( &fds ); - FD_SET( p_access_data->i_handle, &fds ); - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - - if( p_input->b_die || p_input->b_error ) - { - return 0; - } - } - - if( i_ret < 0 ) - { - msg_Err( p_input, "network select error (%s)", strerror(errno) ); - return -1; - } - - i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 ); - - if( i_recv < 0 ) - { -#ifdef WIN32 - /* On win32 recv() will fail if the datagram doesn't fit inside - * the passed buffer, even though the buffer will be filled with - * the first part of the datagram. */ - if( WSAGetLastError() == WSAEMSGSIZE ) - { - msg_Err( p_input, "recv() failed. " - "Increase the mtu size (--mtu option)" ); - i_recv = i_len; - } - else -#endif - msg_Err( p_input, "recv failed (%s)", strerror(errno) ); - } - - return i_recv; - -#endif -} - -/***************************************************************************** - * RTPRead : read from the network, and parse the RTP header - *****************************************************************************/ -static ssize_t RTPRead( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) -{ - int i_rtp_version; - int i_CSRC_count; - int i_payload_type; - int i_skip = 0; - - 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 ); - - if ( i_ret <= 0 ) return 0; /* i_ret is at least 1 */ - - /* 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, "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_input, "unsupported RTP payload type (%u)", i_payload_type ); - } - i_skip += RTP_HEADER_LEN + 4*i_CSRC_count; + bool *pb_bool; + int *pi_int; + int64_t *pi_64; - /* A CSRC extension field is 32 bits in size (4 bytes) */ - if ( i_ret < i_skip ) + switch( i_query ) { - /* Packet is not big enough to hold the complete RTP_HEADER with - * CSRC extensions. - */ - msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len ); - return 0; - } + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = 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: + case ACCESS_GET_CONTENT_TYPE: + return VLC_EGENERIC; + + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; - /* Return the packet without the RTP header. */ - i_ret -= 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; } - - p_input->p_vlc->pf_memcpy( p_buffer, &p_tmp_buffer[i_skip], i_ret ); - - return i_ret; + return VLC_SUCCESS; } /***************************************************************************** - * RTPChoose : read from the network, and decide whether it's UDP or RTP + * BlockUDP: *****************************************************************************/ -static ssize_t RTPChoose( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *BlockUDP( 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 ); - - /* 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 ( i_ret <= 0 ) return 0; /* i_ret is at least 1 */ - - /* Check that it's not TS. */ - if ( p_tmp_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; - } - - /* 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 ) + access_sys_t *p_sys = p_access->p_sys; + block_t *p_block; + ssize_t len; + + if( p_access->info.b_eof ) + return NULL; + + /* Read data */ + p_block = block_New( p_access, MTU ); + len = net_Read( p_access, (intptr_t)p_sys, NULL, + p_block->p_buffer, MTU, false ); + if( len < 0 ) { - msg_Dbg( p_input, "no supported RTP header detected" ); - p_input->pf_read = Read; - p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret ); - return i_ret; + block_Release( p_block ); + return NULL; } - switch ( i_payload_type ) - { - case 33: - msg_Dbg( p_input, "detected TS over RTP" ); - break; - - case 14: - msg_Dbg( p_input, "detected MPEG audio over RTP" ); - if( !p_input->psz_demux || *p_input->psz_demux == '\0' ) - { - p_input->psz_demux = "mp3"; - } - 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; - } - - p_input->pf_read = RTPRead; - - /* A CSRC extension field is 32 bits in size (4 bytes) */ - if( i_ret < RTP_HEADER_LEN + 4*i_CSRC_count ) - { - /* Packet is not big enough to hold the complete RTP_HEADER with - * CSRC extensions. - */ - msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len ); - return 0; - } - - /* Return the packet without the RTP header. */ - i_ret -= RTP_HEADER_LEN + 4*i_CSRC_count; - - 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; - } - - p_input->p_vlc->pf_memcpy( p_buffer, &p_tmp_buffer[RTP_HEADER_LEN + 4*i_CSRC_count], i_ret ); - - return i_ret; + return block_Realloc( p_block, 0, p_block->i_buffer = len ); }