X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=3fb005293ca953d5c7d8e54104fc92fa6b05e599;hb=699dd7887738f8e1373a4cf3d8c03f010c70a29b;hp=f494ac82c7f508005a8dab1444e68178b4968dfc;hpb=851f437fd0a3d7bac2a919f49245112d8f0dd5d7;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index f494ac82c7..3fb005293c 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,10 +1,12 @@ /***************************************************************************** - * http.c: HTTP access plug-in + * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: http.c,v 1.16 2002/12/11 20:13:50 fenrir Exp $ + * Copyright (C) 2001-2005 the VideoLAN team + * $Id$ * - * Authors: Christophe Massiot + * Authors: Laurent Aimar + * Christophe Massiot + * Rémi Denis-Courmont * * 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 @@ -18,707 +20,1455 @@ * * 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 - -#ifdef HAVE_ERRNO_H -# include -#endif -#ifdef HAVE_FCNTL_H -# include +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#ifdef HAVE_UNISTD_H -# include -#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE ) -# include -#endif +#include -#if defined( UNDER_CE ) -# include -#elif defined( WIN32 ) -# include -# include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif -#else -# include -#endif -#include "vlc_playlist.h" -#include "network.h" +#include -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +#include +#include +#include +#include +#include +#include +#include -static int SetProgram ( input_thread_t *, pgrm_descriptor_t * ); -static void Seek ( input_thread_t *, off_t ); -static ssize_t Read ( input_thread_t *, byte_t *, size_t ); +#ifdef HAVE_ZLIB_H +# include +#endif /***************************************************************************** * Module descriptor *****************************************************************************/ -#define PROXY_TEXT N_("specify an HTTP proxy") +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +#define PROXY_TEXT N_("HTTP proxy") #define PROXY_LONGTEXT N_( \ - "Specify an HTTP proxy to use. It must be in the form " \ - "http://myproxy.mydomain:myport . If none is specified, the HTTP_PROXY" \ - "environment variable will be tried." ) + "HTTP proxy to be used It must be of the form " \ + "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \ + "if empty, the http_proxy environment variable will be tried." ) + +#define CACHING_TEXT N_("Caching value in ms") +#define CACHING_LONGTEXT N_( \ + "Caching value for HTTP streams. This " \ + "value should be set in milliseconds." ) + +#define AGENT_TEXT N_("HTTP user agent") +#define AGENT_LONGTEXT N_("User agent that will be " \ + "used for the connection.") + +#define RECONNECT_TEXT N_("Auto re-connect") +#define RECONNECT_LONGTEXT N_( \ + "Automatically try to reconnect to the stream in case of a sudden " \ + "disconnect." ) + +#define CONTINUOUS_TEXT N_("Continuous stream") +#define CONTINUOUS_LONGTEXT N_("Read a file that is " \ + "being constantly updated (for example, a JPG file on a server). " \ + "You should not globally enable this option as it will break all other " \ + "types of HTTP streams." ) + +#define FORWARD_COOKIES_TEXT N_("Forward Cookies") +#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ") vlc_module_begin(); - add_category_hint( N_("http"), NULL ); - add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT ); - set_description( _("HTTP access module") ); - set_capability( "access", 0 ); + set_description( _("HTTP input") ); + set_capability( "access2", 0 ); + set_shortname( _( "HTTP(S)" ) ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + + add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, + VLC_FALSE ); + add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, + CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, + AGENT_LONGTEXT, VLC_TRUE ); + add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, + RECONNECT_LONGTEXT, VLC_TRUE ); + add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, + CONTINUOUS_LONGTEXT, VLC_TRUE ); + add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT, + FORWARD_COOKIES_LONGTEXT, VLC_TRUE ); + add_obsolete_string("http-user"); + add_obsolete_string("http-pwd"); add_shortcut( "http" ); - add_shortcut( "http4" ); - add_shortcut( "http6" ); + add_shortcut( "https" ); + add_shortcut( "unsv" ); + add_shortcut( "itpc" ); /* iTunes Podcast */ set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** - * _input_socket_t: private access plug-in data, modified to add private - * fields + * Local prototypes *****************************************************************************/ -#define MAX_ANSWER_SIZE 1024 -#define MAX_QUERY_SIZE 1024 - -typedef struct _input_socket_s +struct access_sys_t { - input_socket_t _socket; + int fd; + tls_session_t *p_tls; + v_socket_t *p_vs; + + /* From uri */ + vlc_url_t url; + char *psz_user_agent; + + /* Proxy */ + vlc_bool_t b_proxy; + vlc_url_t proxy; + + /* */ + int i_code; + const char *psz_protocol; + int i_version; + + char *psz_mime; + char *psz_pragma; + char *psz_location; + vlc_bool_t b_mms; + vlc_bool_t b_icecast; + vlc_bool_t b_ssl; +#ifdef HAVE_ZLIB_H + vlc_bool_t b_compressed; + struct + { + z_stream stream; + uint8_t *p_buffer; + } inflate; +#endif + + vlc_bool_t b_chunked; + int64_t i_chunk; + + int i_icy_meta; + char *psz_icy_name; + char *psz_icy_genre; + char *psz_icy_title; + + int i_remaining; - char * psz_network; - network_socket_t socket_desc; - char psz_buffer[MAX_QUERY_SIZE]; - char * psz_name; -} _input_socket_t; + vlc_bool_t b_seekable; + vlc_bool_t b_reconnect; + vlc_bool_t b_continuous; + vlc_bool_t b_pace_control; + + vlc_array_t * cookies; +}; + +/* */ +static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ); + +/* */ +static ssize_t Read( access_t *, uint8_t *, size_t ); +static ssize_t ReadCompressed( access_t *, uint8_t *, size_t ); +static int Seek( access_t *, int64_t ); +static int Control( access_t *, int, va_list ); + +/* */ +static int Connect( access_t *, int64_t ); +static int Request( access_t *p_access, int64_t i_tell ); +static void Disconnect( access_t * ); + +/* Small Cookie utilities. Cookies support is partial. */ +static char * cookie_get_content( const char * cookie ); +static char * cookie_get_domain( const char * cookie ); +static char * cookie_get_name( const char * cookie ); +static void cookie_append( vlc_array_t * cookies, char * cookie ); /***************************************************************************** - * HTTPConnect: connect to the server and seek to i_tell + * Open: *****************************************************************************/ -static int HTTPConnect( input_thread_t * p_input, off_t i_tell ) +static int Open( vlc_object_t *p_this ) { - char psz_buffer[MAX_QUERY_SIZE]; - _input_socket_t * p_access_data; - module_t * p_network; - char * psz_parser, * psz_value, * psz_answer; - int i_code, i_ret, i, i_size; - - enum { HTTP_PROTOCOL, ICY_PROTOCOL } i_protocol; + return OpenWithCookies( p_this, NULL ); +} - /* Find an appropriate network module */ - p_access_data = (_input_socket_t *)p_input->p_access_data; - p_input->p_private = (void*) &p_access_data->socket_desc; - p_network = module_Need( p_input, "network", p_access_data->psz_network ); - if( p_network == NULL ) +static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) +{ + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; + char *psz, *p; + /* Only forward an store cookies if the corresponding option is activated */ + vlc_bool_t b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" ); + vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL; + + /* Set up p_access */ + STANDARD_READ_ACCESS_INIT; +#ifdef HAVE_ZLIB_H + p_access->pf_read = ReadCompressed; +#endif + p_sys->fd = -1; + p_sys->b_proxy = VLC_FALSE; + p_sys->i_version = 1; + p_sys->b_seekable = VLC_TRUE; + p_sys->psz_mime = NULL; + p_sys->psz_pragma = NULL; + p_sys->b_mms = VLC_FALSE; + p_sys->b_icecast = VLC_FALSE; + p_sys->psz_location = NULL; + p_sys->psz_user_agent = NULL; + p_sys->b_pace_control = VLC_TRUE; + p_sys->b_ssl = VLC_FALSE; +#ifdef HAVE_ZLIB_H + p_sys->b_compressed = VLC_FALSE; + /* 15 is the max windowBits, +32 to enable optional gzip decoding */ + if( inflateInit2( &p_sys->inflate.stream, 32+15 ) != Z_OK ) + msg_Warn( p_access, "Error during zlib initialisation: %s", + p_sys->inflate.stream.msg ); + if( zlibCompileFlags() & (1<<17) ) + msg_Warn( p_access, "Your zlib was compiled without gzip support." ); + p_sys->inflate.p_buffer = NULL; +#endif + p_sys->p_tls = NULL; + p_sys->p_vs = NULL; + p_sys->i_icy_meta = 0; + p_sys->psz_icy_name = NULL; + p_sys->psz_icy_genre = NULL; + p_sys->psz_icy_title = NULL; + p_sys->i_remaining = 0; + + p_sys->cookies = saved_cookies; + + /* Parse URI - remove spaces */ + p = psz = strdup( p_access->psz_path ); + while( (p = strchr( p, ' ' )) != NULL ) + *p = '+'; + vlc_UrlParse( &p_sys->url, psz, 0 ); + free( psz ); + + if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' ) { - return VLC_ENOMOD; + msg_Warn( p_access, "invalid host" ); + goto error; + } + if( !strncmp( p_access->psz_access, "https", 5 ) ) + { + /* HTTP over SSL */ + p_sys->b_ssl = VLC_TRUE; + if( p_sys->url.i_port <= 0 ) + p_sys->url.i_port = 443; + } + else + { + if( p_sys->url.i_port <= 0 ) + p_sys->url.i_port = 80; } - module_Unneed( p_input, p_network ); - - p_access_data->_socket.i_handle = p_access_data->socket_desc.i_handle; -# define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n" -# define HTTP_END "\r\n" + /* Do user agent */ + p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); - /* Build the query string */ - if ( p_input->stream.b_seekable ) + /* Check proxy */ + psz = var_CreateGetString( p_access, "http-proxy" ); + if( *psz ) { - snprintf( psz_buffer, MAX_QUERY_SIZE, - "%s" - "Range: bytes="I64Fd"-\r\n" - HTTP_USERAGENT HTTP_END, - p_access_data->psz_buffer, i_tell ); + p_sys->b_proxy = VLC_TRUE; + vlc_UrlParse( &p_sys->proxy, psz, 0 ); } +#ifdef HAVE_GETENV else { - snprintf( psz_buffer, MAX_QUERY_SIZE, - "%s" - HTTP_USERAGENT HTTP_END, - p_access_data->psz_buffer ); + char *psz_proxy = getenv( "http_proxy" ); + if( psz_proxy && *psz_proxy ) + { + p_sys->b_proxy = VLC_TRUE; + vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); + } } - psz_buffer[MAX_QUERY_SIZE - 1] = '\0'; +#endif + free( psz ); - /* Send GET query */ - i_ret = send( p_access_data->_socket.i_handle, - psz_buffer, strlen( psz_buffer ), 0 ); - if( i_ret == -1 ) + if( p_sys->b_proxy ) { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "cannot send request (%s)", strerror(errno) ); -#else - msg_Err( p_input, "cannot send request" ); -#endif - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + if( p_sys->proxy.psz_host == NULL || *p_sys->proxy.psz_host == '\0' ) + { + msg_Warn( p_access, "invalid proxy host" ); + goto error; + } + if( p_sys->proxy.i_port <= 0 ) + { + p_sys->proxy.i_port = 80; + } + } + + msg_Dbg( p_access, "http: server='%s' port=%d file='%s", + p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path ); + if( p_sys->b_proxy ) + { + msg_Dbg( p_access, " proxy %s:%d", p_sys->proxy.psz_host, + p_sys->proxy.i_port ); + } + if( p_sys->url.psz_username && *p_sys->url.psz_username ) + { + msg_Dbg( p_access, " user='%s', pwd='%s'", + p_sys->url.psz_username, p_sys->url.psz_password ); } - /* Prepare the input thread for reading. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; + p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" ); + p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" ); + +connect: + /* Connect */ + switch( Connect( p_access, 0 ) ) + { + case -1: + goto error; + + case -2: + /* Retry with http 1.0 */ + msg_Dbg( p_access, "switching to HTTP version 1.0" ); + p_sys->i_version = 0; + p_sys->b_seekable = VLC_FALSE; - /* FIXME: we shouldn't have to do that ! It's UGLY but mandatory because - * input_FillBuffer assumes p_input->pf_read exists */ - p_input->pf_read = Read; + if( p_access->b_die || Connect( p_access, 0 ) ) + goto error; - while( !input_FillBuffer( p_input ) ) +#ifndef NDEBUG + case 0: + break; + + default: + msg_Err( p_access, "You should not be here" ); + abort(); +#endif + } + + if( p_sys->i_code == 401 ) { - if( p_input->b_die || p_input->b_error ) + char *psz_login = NULL; char *psz_password = NULL; + int i_ret; + msg_Dbg( p_access, "authentication failed" ); + i_ret = intf_UserLoginPassword( p_access, _("HTTP authentication"), + _("Please enter a valid login name and a password."), + &psz_login, &psz_password ); + if( i_ret == DIALOG_OK_YES ) { - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + msg_Dbg( p_access, "retrying with user=%s, pwd=%s", + psz_login, psz_password ); + if( psz_login ) p_sys->url.psz_username = strdup( psz_login ); + if( psz_password ) p_sys->url.psz_password = strdup( psz_password ); + free( psz_login ); + free( psz_password ); + goto connect; + } + else + { + free( psz_login ); + free( psz_password ); + goto error; } } - /* Get the HTTP returncode */ - i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE ); - - if( i_size <= 0 ) + if( ( p_sys->i_code == 301 || p_sys->i_code == 302 || + p_sys->i_code == 303 || p_sys->i_code == 307 ) && + p_sys->psz_location && *p_sys->psz_location ) { - msg_Err( p_input, "not enough data" ); - Close( VLC_OBJECT(p_input) ); - return VLC_EGENERIC; + msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); + + /* Do not accept redirection outside of HTTP works */ + if( strncmp( p_sys->psz_location, "http", 4 ) + || ( ( p_sys->psz_location[4] != ':' ) /* HTTP */ + && strncmp( p_sys->psz_location + 4, "s:", 2 ) /* HTTP/SSL */ ) ) + { + msg_Err( p_access, "insecure redirection ignored" ); + goto error; + } + free( p_access->psz_path ); + p_access->psz_path = strdup( p_sys->psz_location ); + /* Clean up current Open() run */ + vlc_UrlClean( &p_sys->url ); + vlc_UrlClean( &p_sys->proxy ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + free( p_sys->psz_location ); + free( p_sys->psz_user_agent ); + + Disconnect( p_access ); + cookies = p_sys->cookies; + free( p_sys ); + + /* Do new Open() run with new data */ + return OpenWithCookies( p_this, cookies ); } - /* Guess the protocol */ - if( ( ( (size_t)i_size >= strlen("HTTP/1.x") ) && - !strncmp( psz_parser, "HTTP/1.", strlen("HTTP/1.") ) ) ) + if( p_sys->b_mms ) { - i_protocol = HTTP_PROTOCOL; - - psz_parser += strlen("HTTP/1.x"); - i_size -= strlen("HTTP/1.x"); + msg_Dbg( p_access, "this is actually a live mms server, BAIL" ); + goto error; } - else if( ( (size_t)i_size >= strlen("ICY") && - !strncmp( psz_parser, "ICY", strlen("ICY") ) ) ) + + if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast ) { - i_protocol = ICY_PROTOCOL; - if( !p_input->psz_demux || !*p_input->psz_demux ) + if( p_sys->psz_mime && strcasecmp( p_sys->psz_mime, "application/ogg" ) ) { - msg_Info( p_input, "ICY server found, mp3 demuxer selected" ); - p_input->psz_demux = "mp3"; // FIXME strdup ? + if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) || + !strcasecmp( p_sys->psz_mime, "video/nsa" ) ) + p_access->psz_demux = strdup( "nsv" ); + else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) || + !strcasecmp( p_sys->psz_mime, "audio/aacp" ) ) + p_access->psz_demux = strdup( "m4a" ); + else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) ) + p_access->psz_demux = strdup( "mp3" ); + + msg_Info( p_access, "Raw-audio server found, %s demuxer selected", + p_access->psz_demux ); + +#if 0 /* Doesn't work really well because of the pre-buffering in + * shoutcast servers (the buffer content will be sent as fast as + * possible). */ + p_sys->b_pace_control = VLC_FALSE; +#endif } - - psz_parser += strlen("ICY"); - i_size -= strlen("ICY"); + else if( !p_sys->psz_mime ) + { + /* Shoutcast */ + p_access->psz_demux = strdup( "mp3" ); + } + /* else probably Ogg Vorbis */ } - else + else if( !strcasecmp( p_access->psz_access, "unsv" ) && + p_sys->psz_mime && + !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) ) { - msg_Err( p_input, "invalid HTTP reply '%s'", psz_parser ); - return VLC_EGENERIC; + /* Grrrr! detect ultravox server and force NSV demuxer */ + p_access->psz_demux = strdup( "nsv" ); } + else if( !strcmp( p_access->psz_access, "itpc" ) ) + { + p_access->psz_demux = strdup( "podcast" ); + } + else if( p_sys->psz_mime && + !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) && + ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) ) + p_access->psz_demux = strdup( "xspf-open" ); + + if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" ); + + /* PTS delay */ + var_Create( p_access, "http-caching", VLC_VAR_INTEGER |VLC_VAR_DOINHERIT ); + + return VLC_SUCCESS; + +error: + vlc_UrlClean( &p_sys->url ); + vlc_UrlClean( &p_sys->proxy ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + free( p_sys->psz_location ); + free( p_sys->psz_user_agent ); + + Disconnect( p_access ); + free( p_sys ); + return VLC_EGENERIC; +} + +/***************************************************************************** + * Close: + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys = p_access->p_sys; + + vlc_UrlClean( &p_sys->url ); + vlc_UrlClean( &p_sys->proxy ); - /* Check the HTTP return code */ - i_code = atoi( (char*)psz_parser ); - msg_Dbg( p_input, "%s server replied: %i", - i_protocol == HTTP_PROTOCOL ? "HTTP" : "ICY", i_code ); - psz_parser += 4; - i_size -= 4; + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + free( p_sys->psz_location ); - /* Find the end of the line */ - for ( i = 0; (i < i_size -1) && ((psz_parser[i] != '\r') || - (psz_parser[i+1] != '\n')); i++ ) + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_title ); + + free( p_sys->psz_user_agent ); + + Disconnect( p_access ); + + if( p_sys->cookies ) { - ; + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) + free(vlc_array_item_at_index( p_sys->cookies, i )); + vlc_array_destroy( p_sys->cookies ); } - /* Check we actually parsed something */ - if ( i+1 == i_size && psz_parser[i+1] != '\n' ) +#ifdef HAVE_ZLIB_H + inflateEnd( &p_sys->inflate.stream ); + free( p_sys->inflate.p_buffer ); +#endif + + free( p_sys ); +} + +/***************************************************************************** + * Read: Read up to i_len bytes from the http connection and place in + * p_buffer. Return the actual number of bytes read + *****************************************************************************/ +static int ReadICYMeta( access_t *p_access ); +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) +{ + access_sys_t *p_sys = p_access->p_sys; + int i_read; + + if( p_sys->fd < 0 ) { - msg_Err( p_input, "stream not compliant with HTTP/1.x" ); - return VLC_EGENERIC; + p_access->info.b_eof = VLC_TRUE; + return 0; } - /* Store the line we just parsed and skip it */ - psz_answer = strndup( psz_parser, i ); - if( !psz_answer ) + if( p_access->info.i_size > 0 && + i_len + p_access->info.i_pos > p_access->info.i_size ) { - return VLC_ENOMEM; + if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 ) + { + p_access->info.b_eof = VLC_TRUE; + return 0; + } } - p_input->p_current_data = psz_parser + i + 2; - - /* Parse remaining headers */ - for ( ; ; ) + if( p_sys->b_chunked ) { - char psz_line[MAX_ANSWER_SIZE]; - - i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE ); - - if( i_size <= 0 ) + if( p_sys->i_chunk < 0 ) { - msg_Err( p_input, "not enough data" ); - Close( VLC_OBJECT(p_input) ); - free( psz_answer ); - return VLC_EGENERIC; + p_access->info.b_eof = VLC_TRUE; + return 0; } - /* Copy one line to psz_line */ - i = 0; - while( i_size && psz_parser[i] != '\r' - && psz_parser[i + 1] != '\n' ) + if( p_sys->i_chunk <= 0 ) { - psz_line[i] = psz_parser[i]; - i++; - i_size--; + char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); + /* read the chunk header */ + if( psz == NULL ) + { + /* fatal error - end of file */ + msg_Dbg( p_access, "failed reading chunk-header line" ); + return 0; + } + p_sys->i_chunk = strtoll( psz, NULL, 16 ); + free( psz ); + + if( p_sys->i_chunk <= 0 ) /* eof */ + { + p_sys->i_chunk = -1; + p_access->info.b_eof = VLC_TRUE; + return 0; + } } - p_input->p_current_data = psz_parser + i + 2; - if( !i ) + + if( i_len > p_sys->i_chunk ) { - break; /* End of headers */ + i_len = p_sys->i_chunk; } - psz_line[i] = '\0'; - psz_parser = strchr( psz_line, ':' ); - if ( !psz_parser ) + } + + if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining ) + { + /* Only ask for the remaining length */ + int i_new_len = p_sys->i_remaining; + if( i_new_len == 0 ) { - msg_Err( p_input, "malformed header line: %s", psz_line ); - free( psz_answer ); - return VLC_EGENERIC; + Request( p_access, 0 ); + i_read = Read( p_access, p_buffer, i_len ); + return i_read; } - psz_parser[0] = '\0'; - psz_parser++; - while ( *psz_parser == ' ' || *psz_parser == '\t' ) + i_len = i_new_len; + } + + if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 ) + { + int64_t i_next = p_sys->i_icy_meta - + p_access->info.i_pos % p_sys->i_icy_meta; + + if( i_next == p_sys->i_icy_meta ) { - psz_parser++; + if( ReadICYMeta( p_access ) ) + { + p_access->info.b_eof = VLC_TRUE; + return -1; + } } - psz_value = psz_parser; + if( i_len > i_next ) + i_len = i_next; + } + + i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, VLC_FALSE ); - if( !strcasecmp( psz_line, "Content-Length" ) ) + if( i_read > 0 ) + { + p_access->info.i_pos += i_read; + + if( p_sys->b_chunked ) { - off_t i_size = 0; -#ifdef HAVE_ATOLL - i_size = i_tell + atoll( psz_value ); -#else - psz_parser = psz_value; - while( psz_parser[0] >= '0' && psz_parser[0] <= '9' ) + p_sys->i_chunk -= i_read; + if( p_sys->i_chunk <= 0 ) { - i_size *= 10; - i_size += psz_parser[0] - '0'; + /* read the empty line */ + char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs ); + free( psz ); } - i_size += i_tell; -#endif - msg_Dbg( p_input, "stream size is "I64Fd, i_size ); - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_size = i_size; - vlc_mutex_unlock( &p_input->stream.stream_lock ); } - /* Redirection support */ - else if( ( i_code == 301 || i_code == 302 || - i_code == 303 || i_code == 307 ) - && !strcasecmp( psz_line, "location" ) ) + } + else if( i_read == 0 ) + { + /* + * I very much doubt that this will work. + * If i_read == 0, the connection *IS* dead, so the only + * sensible thing to do is Disconnect() and then retry. + * Otherwise, I got recv() completely wrong. -- Courmisch + */ + if( p_sys->b_continuous ) + { + Request( p_access, 0 ); + p_sys->b_continuous = VLC_FALSE; + i_read = Read( p_access, p_buffer, i_len ); + p_sys->b_continuous = VLC_TRUE; + } + Disconnect( p_access ); + if( p_sys->b_reconnect ) { - playlist_t * p_playlist = (playlist_t *) vlc_object_find( - p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); - if( !p_playlist ) + msg_Dbg( p_access, "got disconnected, trying to reconnect" ); + if( Connect( p_access, p_access->info.i_pos ) ) + { + msg_Dbg( p_access, "reconnection failed" ); + } + else { - msg_Err( p_input, "redirection failed: can't find playlist" ); - free( psz_answer ); - return VLC_EGENERIC; + p_sys->b_reconnect = VLC_FALSE; + i_read = Read( p_access, p_buffer, i_len ); + p_sys->b_reconnect = VLC_TRUE; } - msg_Dbg( p_input, "%i %s: redirected to %s", - i_code, psz_answer, psz_value ); - p_playlist->pp_items[p_playlist->i_index]->b_autodeletion - = VLC_TRUE; - playlist_Add( p_playlist, psz_value, - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); - vlc_object_release( p_playlist ); } - /* TODO: parse other headers here */ + if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE; } - /* Something went wrong */ - if ( i_code >= 400 ) + if( p_sys->b_continuous ) { - msg_Err( p_input, "%i %s", i_code, psz_answer ); - p_input->p_current_data = psz_parser + i_size; - free( psz_answer ); + p_sys->i_remaining -= i_read; + } + + return i_read; +} + +static int ReadICYMeta( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; + + uint8_t buffer; + char *p, *psz_meta; + int i_read; + + /* Read meta data length */ + i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1, + VLC_TRUE ); + if( i_read <= 0 ) + return VLC_EGENERIC; + if( buffer == 0 ) + return VLC_SUCCESS; + + i_read = buffer << 4; + /* msg_Dbg( p_access, "ICY meta size=%u", i_read); */ + + psz_meta = malloc( i_read + 1 ); + if( net_Read( p_access, p_sys->fd, p_sys->p_vs, + (uint8_t *)psz_meta, i_read, VLC_TRUE ) != i_read ) return VLC_EGENERIC; + + psz_meta[i_read] = '\0'; /* Just in case */ + + /* msg_Dbg( p_access, "icy-meta=%s", psz_meta ); */ + + /* Now parse the meta */ + /* Look for StreamTitle= */ + p = strcasestr( (char *)psz_meta, "StreamTitle=" ); + if( p ) + { + p += strlen( "StreamTitle=" ); + if( *p == '\'' || *p == '"' ) + { + char closing[] = { p[0], ';', '\0' }; + char *psz = strstr( &p[1], closing ); + if( !psz ) + psz = strchr( &p[1], ';' ); + + if( psz ) *psz = '\0'; + } + else + { + char *psz = strchr( &p[1], ';' ); + if( psz ) *psz = '\0'; + } + + if( !p_sys->psz_icy_title || + strcmp( p_sys->psz_icy_title, &p[1] ) ) + { + free( p_sys->psz_icy_title ); + p_sys->psz_icy_title = strdup( &p[1] ); + p_access->info.i_update |= INPUT_UPDATE_META; + + msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); + } } + free( psz_meta ); + + return VLC_SUCCESS; +} - free( psz_answer ); +#ifdef HAVE_ZLIB_H +static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer, + size_t i_len ) +{ + access_sys_t *p_sys = p_access->p_sys; - /* Set final stream properties */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( i_protocol == ICY_PROTOCOL ) + if( p_sys->b_compressed ) { - p_input->stream.b_seekable = VLC_FALSE; + int i_ret; + + if( !p_sys->inflate.p_buffer ) + p_sys->inflate.p_buffer = malloc( 256 * 1024 ); + + if( p_sys->inflate.stream.avail_in == 0 ) + { + ssize_t i_read = Read( p_access, p_sys->inflate.p_buffer + p_sys->inflate.stream.avail_in, 256 * 1024 ); + if( i_read <= 0 ) return i_read; + p_sys->inflate.stream.next_in = p_sys->inflate.p_buffer; + p_sys->inflate.stream.avail_in = i_read; + } + + p_sys->inflate.stream.avail_out = i_len; + p_sys->inflate.stream.next_out = p_buffer; + + i_ret = inflate( &p_sys->inflate.stream, Z_SYNC_FLUSH ); + msg_Warn( p_access, "inflate return value: %d, %s", i_ret, p_sys->inflate.stream.msg ); + + return i_len - p_sys->inflate.stream.avail_out; } else { - p_input->stream.b_seekable = VLC_TRUE; + return Read( p_access, p_buffer, i_len ); } +} +#endif - if( p_input->stream.p_selected_area->i_size ) +/***************************************************************************** + * Seek: close and re-open a connection at the right place + *****************************************************************************/ +static int Seek( access_t *p_access, int64_t i_pos ) +{ + msg_Dbg( p_access, "trying to seek to "I64Fd, i_pos ); + + Disconnect( p_access ); + + if( Connect( p_access, i_pos ) ) { - p_input->stream.p_selected_area->i_tell = i_tell; - + (p_input->p_last_data - p_input->p_current_data); + msg_Err( p_access, "seek failed" ); + p_access->info.b_eof = VLC_TRUE; + return VLC_EGENERIC; } - else + return VLC_SUCCESS; +} + +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( access_t *p_access, int i_query, va_list args ) +{ + access_sys_t *p_sys = p_access->p_sys; + vlc_bool_t *pb_bool; + int *pi_int; + int64_t *pi_64; + vlc_meta_t *p_meta; + + switch( i_query ) { - p_input->stream.b_seekable = VLC_FALSE; - } - p_input->stream.b_changed = VLC_TRUE; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + /* */ + case ACCESS_CAN_SEEK: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = p_sys->b_seekable; + break; + case ACCESS_CAN_FASTSEEK: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = VLC_FALSE; + break; + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + +#if 0 /* Disable for now until we have a clock synchro algo + * which works with something else than MPEG over UDP */ + *pb_bool = p_sys->b_pace_control; +#endif + *pb_bool = VLC_TRUE; + break; + + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = 0; + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + break; + + case ACCESS_GET_META: + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + + if( p_sys->psz_icy_name ) + vlc_meta_Set( p_meta, vlc_meta_Title, p_sys->psz_icy_name ); + if( p_sys->psz_icy_genre ) + vlc_meta_Set( p_meta, vlc_meta_Genre, p_sys->psz_icy_genre ); + if( p_sys->psz_icy_title ) + vlc_meta_Set( p_meta, vlc_meta_NowPlaying, p_sys->psz_icy_title ); + break; + + case ACCESS_GET_CONTENT_TYPE: + *va_arg( args, char ** ) = + p_sys->psz_mime ? strdup( p_sys->psz_mime ) : NULL; + break; + + 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; + + } return VLC_SUCCESS; } /***************************************************************************** - * Open: parse URL and open the remote file at the beginning + * Connect: *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +static int Connect( access_t *p_access, int64_t i_tell ) { - input_thread_t * p_input = (input_thread_t *)p_this; - _input_socket_t * p_access_data; - char * psz_name = strdup(p_input->psz_name); - char * psz_parser = psz_name; - char * psz_server_addr = ""; - char * psz_server_port = ""; - char * psz_path = ""; - char * psz_proxy, *psz_proxy_orig; - int i_server_port = 0; - - p_access_data = malloc( sizeof(_input_socket_t) ); - p_input->p_access_data = (access_sys_t *)p_access_data; - if( p_access_data == NULL ) + access_sys_t *p_sys = p_access->p_sys; + vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; + + /* Clean info */ + free( p_sys->psz_location ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_title ); + + + p_sys->psz_location = NULL; + p_sys->psz_mime = NULL; + p_sys->psz_pragma = NULL; + p_sys->b_mms = VLC_FALSE; + p_sys->b_chunked = VLC_FALSE; + p_sys->i_chunk = 0; + p_sys->i_icy_meta = 0; + p_sys->psz_icy_name = NULL; + p_sys->psz_icy_genre = NULL; + p_sys->psz_icy_title = NULL; + + p_access->info.i_size = 0; + p_access->info.i_pos = i_tell; + p_access->info.b_eof = VLC_FALSE; + + + /* Open connection */ + p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); + if( p_sys->fd == -1 ) { - msg_Err( p_input, "out of memory" ); - free(psz_name); - return VLC_ENOMEM; + msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); + return -1; } - p_access_data->psz_name = psz_name; - p_access_data->psz_network = ""; - if( config_GetInt( p_input, "ipv4" ) ) + /* Initialize TLS/SSL session */ + if( p_sys->b_ssl == VLC_TRUE ) { - p_access_data->psz_network = "ipv4"; + /* CONNECT to establish TLS tunnel through HTTP proxy */ + if( p_sys->b_proxy ) + { + char *psz; + unsigned i_status = 0; + + if( p_sys->i_version == 0 ) + { + /* CONNECT is not in HTTP/1.0 */ + Disconnect( p_access ); + return -1; + } + + net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + "CONNECT %s:%d HTTP/1.%d\r\nHost: %s:%d\r\n\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->i_version, + p_sys->url.psz_host, p_sys->url.i_port); + + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) + { + msg_Err( p_access, "cannot establish HTTP/TLS tunnel" ); + Disconnect( p_access ); + return -1; + } + + sscanf( psz, "HTTP/%*u.%*u %3u", &i_status ); + free( psz ); + + if( ( i_status / 100 ) != 2 ) + { + msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" ); + Disconnect( p_access ); + return -1; + } + + do + { + psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ); + if( psz == NULL ) + { + msg_Err( p_access, "HTTP proxy connection failed" ); + Disconnect( p_access ); + return -1; + } + + if( *psz == '\0' ) + i_status = 0; + + free( psz ); + + if( p_access->b_die || p_access->b_error ) + { + Disconnect( p_access ); + return -1; + } + } + while( i_status ); + } + + /* TLS/SSL handshake */ + p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd, + srv.psz_host ); + if( p_sys->p_tls == NULL ) + { + msg_Err( p_access, "cannot establish HTTP/TLS session" ); + Disconnect( p_access ); + return -1; + } + p_sys->p_vs = &p_sys->p_tls->sock; } - if( config_GetInt( p_input, "ipv6" ) ) + + return Request( p_access, i_tell ) ? -2 : 0; +} + + +static int Request( access_t *p_access, int64_t i_tell ) +{ + access_sys_t *p_sys = p_access->p_sys; + char *psz ; + v_socket_t *pvs = p_sys->p_vs; + + if( p_sys->b_proxy ) { - p_access_data->psz_network = "ipv6"; + if( p_sys->url.psz_path ) + { + net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + "GET http://%s:%d%s HTTP/1.%d\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->url.psz_path, p_sys->i_version ); + } + else + { + net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, + "GET http://%s:%d/ HTTP/1.%d\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->i_version ); + } } - if( *p_input->psz_access ) + else { - /* Find out which shortcut was used */ - if( !strncmp( p_input->psz_access, "http6", 6 ) ) + const char *psz_path = p_sys->url.psz_path; + if( !psz_path || !*psz_path ) + { + psz_path = "/"; + } + if( p_sys->url.i_port != (pvs ? 443 : 80) ) { - p_access_data->psz_network = "ipv6"; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "GET %s HTTP/1.%d\r\nHost: %s:%d\r\n", + psz_path, p_sys->i_version, p_sys->url.psz_host, + p_sys->url.i_port ); } - else if( !strncmp( p_input->psz_access, "http4", 6 ) ) + else { - p_access_data->psz_network = "ipv4"; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "GET %s HTTP/1.%d\r\nHost: %s\r\n", + psz_path, p_sys->i_version, p_sys->url.psz_host ); } } - - /* Parse psz_name syntax : - * //[:][/] */ - while( *psz_parser == '/' ) + /* User Agent */ + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n", + p_sys->psz_user_agent ); + /* Offset */ + if( p_sys->i_version == 1 ) { - psz_parser++; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Range: bytes="I64Fd"-\r\n", i_tell ); } - psz_server_addr = psz_parser; - while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) + /* Cookies */ + if( p_sys->cookies ) { - psz_parser++; + int i; + for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ ) + { + const char * cookie = vlc_array_item_at_index( p_sys->cookies, i ); + char * psz_cookie_content = cookie_get_content( cookie ); + char * psz_cookie_domain = cookie_get_domain( cookie ); + + assert( psz_cookie_content ); + + /* FIXME: This is clearly not conforming to the rfc */ + vlc_bool_t is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain )); + + if( is_in_right_domain ) + { + msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content ); + if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 ) + msg_Err( p_access, "failed to send Cookie" ); + } + free( psz_cookie_content ); + free( psz_cookie_domain ); + } } - if ( *psz_parser == ':' ) + /* Authentication */ + if( p_sys->url.psz_username || p_sys->url.psz_password ) { - *psz_parser = '\0'; - psz_parser++; - psz_server_port = psz_parser; + char buf[strlen( p_sys->url.psz_username ?: "" ) + + strlen( p_sys->url.psz_password ?: "" ) + 2]; + char *b64; + + snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "", + p_sys->url.psz_password ?: "" ); + b64 = vlc_b64_encode( buf ); - while( *psz_parser && *psz_parser != '/' ) + if( b64 != NULL ) { - psz_parser++; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Authorization: Basic %s\r\n", b64 ); + free( b64 ); } } - if( *psz_parser == '/' ) + /* Proxy Authentication */ + if( p_sys->proxy.psz_username || p_sys->proxy.psz_password ) { - *psz_parser = '\0'; - psz_parser++; - psz_path = psz_parser; - } + char buf[strlen( p_sys->proxy.psz_username ?: "" ) + + strlen( p_sys->proxy.psz_password ?: "" )]; + char *b64; - /* Convert port format */ - if( *psz_server_port ) - { - i_server_port = strtol( psz_server_port, &psz_parser, 10 ); - if( *psz_parser ) + snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "", + p_sys->proxy.psz_password ?: "" ); + b64 = vlc_b64_encode( buf ); + + if( b64 != NULL) { - msg_Err( p_input, "cannot parse server port near %s", psz_parser ); - free( p_input->p_access_data ); - free( psz_name ); - return VLC_EGENERIC; + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Proxy-Authorization: Basic %s\r\n", b64 ); + free( b64 ); } } - if( i_server_port == 0 ) + /* ICY meta data request */ + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); + + + if( p_sys->b_continuous ) { - i_server_port = 80; + net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, + "Connection: Keep-Alive\r\n" ); + } + else if( p_sys->i_version == 1 ) + { + net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, + "Connection: Close\r\n"); } - if( !*psz_server_addr ) + if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 ) { - msg_Err( p_input, "no server given" ); - free( p_input->p_access_data ); - free( psz_name ); + msg_Err( p_access, "failed to send request" ); + Disconnect( p_access ); return VLC_EGENERIC; } - /* Check proxy config variable */ - psz_proxy_orig = config_GetPsz( p_input, "http-proxy" ); - if( psz_proxy_orig == NULL ) + /* Read Answer */ + if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ) ) == NULL ) { - /* Check proxy environment variable */ - psz_proxy_orig = getenv( "http_proxy" ); - if( psz_proxy_orig != NULL ) - { - psz_proxy_orig = strdup( psz_proxy_orig ); - } + msg_Err( p_access, "failed to read answer" ); + goto error; + } + if( !strncmp( psz, "HTTP/1.", 7 ) ) + { + p_sys->psz_protocol = "HTTP"; + p_sys->i_code = atoi( &psz[9] ); } + else if( !strncmp( psz, "ICY", 3 ) ) + { + p_sys->psz_protocol = "ICY"; + p_sys->i_code = atoi( &psz[4] ); + p_sys->b_reconnect = VLC_TRUE; + } + else + { + msg_Err( p_access, "invalid HTTP reply '%s'", psz ); + free( psz ); + goto error; + } + msg_Dbg( p_access, "protocol '%s' answer code %d", + p_sys->psz_protocol, p_sys->i_code ); + if( !strcmp( p_sys->psz_protocol, "ICY" ) ) + { + p_sys->b_seekable = VLC_FALSE; + } + if( p_sys->i_code != 206 && p_sys->i_code != 401 ) + { + p_sys->b_seekable = VLC_FALSE; + } + /* Authentication error - We'll have to display the dialog */ + if( p_sys->i_code == 401 ) + { - psz_proxy = psz_proxy_orig; - if( psz_proxy != NULL && *psz_proxy ) + } + /* Other fatal error */ + else if( p_sys->i_code >= 400 ) { - /* http://myproxy.mydomain:myport/ */ - int i_proxy_port = 0; + msg_Err( p_access, "error: %s", psz ); + free( psz ); + goto error; + } + free( psz ); + + for( ;; ) + { + char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ); + char *p; + + if( psz == NULL ) + { + msg_Err( p_access, "failed to read answer" ); + goto error; + } - /* Skip the protocol name */ - while( *psz_proxy && *psz_proxy != ':' ) + if( p_access->b_die || p_access->b_error ) { - psz_proxy++; + free( psz ); + goto error; } - /* Skip the "://" part */ - while( *psz_proxy && (*psz_proxy == ':' || *psz_proxy == '/') ) + /* msg_Dbg( p_input, "Line=%s", psz ); */ + if( *psz == '\0' ) { - psz_proxy++; + free( psz ); + break; } - /* Found a proxy name */ - if( *psz_proxy ) + if( ( p = strchr( psz, ':' ) ) == NULL ) { - char *psz_port = psz_proxy; + msg_Err( p_access, "malformed header line: %s", psz ); + free( psz ); + goto error; + } + *p++ = '\0'; + while( *p == ' ' ) p++; - /* Skip the hostname part */ - while( *psz_port && *psz_port != ':' && *psz_port != '/' ) + if( !strcasecmp( psz, "Content-Length" ) ) + { + if( p_sys->b_continuous ) { - psz_port++; + p_access->info.i_size = -1; + msg_Dbg( p_access, "this frame size=%lld", atoll(p ) ); + p_sys->i_remaining = atoll( p ); } - - /* Found a port name */ - if( *psz_port ) + else { - char * psz_junk; - - /* Replace ':' with '\0' */ - *psz_port = '\0'; - psz_port++; + p_access->info.i_size = i_tell + atoll( p ); + msg_Dbg( p_access, "stream size="I64Fd, p_access->info.i_size ); + } + } + else if( !strcasecmp( psz, "Location" ) ) + { + char * psz_new_loc; - psz_junk = psz_port; - while( *psz_junk && *psz_junk != '/' ) - { - psz_junk++; - } + /* This does not follow RFC 2068, but yet if the url is not absolute, + * handle it as everyone does. */ + if( p[0] == '/' ) + { + const char *psz_http_ext = p_sys->b_ssl ? "s" : "" ; - if( *psz_junk ) + if( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) ) { - *psz_junk = '\0'; + if( asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext, + p_sys->url.psz_host, p) < 0 ) + goto error; } - - if( *psz_port != '\0' ) + else { - i_proxy_port = atoi( psz_port ); + if( asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext, + p_sys->url.psz_host, p_sys->url.i_port, p) < 0 ) + goto error; } } + else + { + psz_new_loc = strdup( p ); + } - psz_proxy = strdup( psz_proxy ); - - msg_Dbg( p_input, "using HTTP proxy server=%s port=%d", - psz_proxy, i_proxy_port ); + free( p_sys->psz_location ); + p_sys->psz_location = psz_new_loc; } - else + else if( !strcasecmp( psz, "Content-Type" ) ) { - msg_Err( p_input, "HTTP proxy %s is invalid!", psz_proxy_orig ); - free( p_input->p_access_data ); - free( psz_name ); - if( psz_proxy_orig ) free( psz_proxy_orig ); - return VLC_EGENERIC; + free( p_sys->psz_mime ); + p_sys->psz_mime = strdup( p ); + msg_Dbg( p_access, "Content-Type: %s", p_sys->psz_mime ); } + else if( !strcasecmp( psz, "Content-Encoding" ) ) + { + msg_Dbg( p_access, "Content-Encoding: %s", p ); + if( strcasecmp( p, "identity" ) ) +#ifdef HAVE_ZLIB_H + p_sys->b_compressed = VLC_TRUE; +#else + msg_Warn( p_access, "Compressed content not supported. Rebuild with zlib support." ); +#endif + } + else if( !strcasecmp( psz, "Pragma" ) ) + { + if( !strcasecmp( psz, "Pragma: features" ) ) + p_sys->b_mms = VLC_TRUE; + free( p_sys->psz_pragma ); + p_sys->psz_pragma = strdup( p ); + msg_Dbg( p_access, "Pragma: %s", p_sys->psz_pragma ); + } + else if( !strcasecmp( psz, "Server" ) ) + { + msg_Dbg( p_access, "Server: %s", p ); + if( !strncasecmp( p, "Icecast", 7 ) || + !strncasecmp( p, "Nanocaster", 10 ) ) + { + /* Remember if this is Icecast + * we need to force demux in this case without breaking + * autodetection */ - if( psz_proxy_orig ) free( psz_proxy_orig ); - - p_access_data->socket_desc.psz_server_addr = psz_proxy; - p_access_data->socket_desc.i_server_port = i_proxy_port; - p_access_data->socket_desc.i_type = NETWORK_TCP; - - snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE, - "GET http://%s:%d/%s\r\n HTTP/1.0\r\n", - psz_server_addr, i_server_port, psz_path ); - } - else - { - /* No proxy, direct connection. */ - p_access_data->socket_desc.i_type = NETWORK_TCP; - p_access_data->socket_desc.psz_server_addr = psz_server_addr; - p_access_data->socket_desc.i_server_port = i_server_port; - - snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE, - "GET /%s HTTP/1.1\r\nHost: %s\r\n", - psz_path, psz_server_addr ); - } - p_access_data->psz_buffer[MAX_QUERY_SIZE - 1] = '\0'; - - msg_Dbg( p_input, "opening server=%s port=%d path=%s", - psz_server_addr, i_server_port, psz_path ); - - p_input->pf_read = Read; - p_input->pf_set_program = SetProgram; - p_input->pf_set_area = NULL; - p_input->pf_seek = Seek; + /* Let live 365 streams (nanocaster) piggyback on the icecast + * routine. They look very similar */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_pace_control = VLC_TRUE; - p_input->stream.b_seekable = VLC_TRUE; - p_input->stream.p_selected_area->i_tell = 0; - p_input->stream.p_selected_area->i_size = 0; - p_input->stream.i_method = INPUT_METHOD_NETWORK; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_input->i_mtu = 0; + p_sys->b_reconnect = VLC_TRUE; + p_sys->b_pace_control = VLC_FALSE; + p_sys->b_icecast = VLC_TRUE; + } + } + else if( !strcasecmp( psz, "Transfer-Encoding" ) ) + { + msg_Dbg( p_access, "Transfer-Encoding: %s", p ); + if( !strncasecmp( p, "chunked", 7 ) ) + { + p_sys->b_chunked = VLC_TRUE; + } + } + else if( !strcasecmp( psz, "Icy-MetaInt" ) ) + { + msg_Dbg( p_access, "Icy-MetaInt: %s", p ); + p_sys->i_icy_meta = atoi( p ); + if( p_sys->i_icy_meta < 0 ) + p_sys->i_icy_meta = 0; - if( HTTPConnect( p_input, 0 ) ) - { - /* Request failed, try again with HTTP/1.0 */ - char * psz_pos = strstr( p_access_data->psz_buffer, "HTTP/1.1" ); + msg_Warn( p_access, "ICY metaint=%d", p_sys->i_icy_meta ); + } + else if( !strcasecmp( psz, "Icy-Name" ) ) + { + free( p_sys->psz_icy_name ); + p_sys->psz_icy_name = strdup( p ); + msg_Dbg( p_access, "Icy-Name: %s", p_sys->psz_icy_name ); - if( !psz_pos ) + p_sys->b_icecast = VLC_TRUE; /* be on the safeside. set it here as well. */ + p_sys->b_reconnect = VLC_TRUE; + p_sys->b_pace_control = VLC_FALSE; + } + else if( !strcasecmp( psz, "Icy-Genre" ) ) { - return VLC_EGENERIC; + free( p_sys->psz_icy_genre ); + p_sys->psz_icy_genre = strdup( p ); + msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre ); } - - p_input->stream.b_seekable = VLC_FALSE; - psz_pos[7] = '0'; - if( HTTPConnect( p_input, 0 ) ) + else if( !strncasecmp( psz, "Icy-Notice", 10 ) ) { - free( p_input->p_access_data ); - free( psz_name ); - return VLC_EGENERIC; + msg_Dbg( p_access, "Icy-Notice: %s", p ); + } + else if( !strncasecmp( psz, "icy-", 4 ) || + !strncasecmp( psz, "ice-", 4 ) || + !strncasecmp( psz, "x-audiocast", 11 ) ) + { + msg_Dbg( p_access, "Meta-Info: %s: %s", psz, p ); + } else if( !strcasecmp( psz, "Set-Cookie" ) ) + { + if( p_sys->cookies ) + { + msg_Dbg( p_access, "Accepting Cookie: %s", p ); + cookie_append( p_sys->cookies, strdup(p) ); + } + else + msg_Dbg( p_access, "We have a Cookie we won't remember: %s", p ); } - } + free( psz ); + } return VLC_SUCCESS; + +error: + Disconnect( p_access ); + return VLC_EGENERIC; } /***************************************************************************** - * Close: free unused data structures + * Disconnect: *****************************************************************************/ -static void Close( vlc_object_t *p_this ) +static void Disconnect( access_t *p_access ) { - input_thread_t * p_input = (input_thread_t *)p_this; - int i_handle = ((network_socket_t *)p_input->p_access_data)->i_handle; - _input_socket_t * p_access_data = - (_input_socket_t *)p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; - free( p_access_data->psz_name ); - - msg_Info( p_input, "closing HTTP target `%s'", p_input->psz_source ); - -#if defined( WIN32 ) || defined( UNDER_CE ) - closesocket( i_handle ); -#else - close( i_handle ); -#endif + if( p_sys->p_tls != NULL) + { + tls_ClientDelete( p_sys->p_tls ); + p_sys->p_tls = NULL; + p_sys->p_vs = NULL; + } + if( p_sys->fd != -1) + { + net_Close(p_sys->fd); + p_sys->fd = -1; + } - free( p_access_data ); } /***************************************************************************** - * SetProgram: do nothing + * Cookies (FIXME: we may want to rewrite that using a nice structure to hold + * them) (FIXME: only support the "domain=" param) *****************************************************************************/ -static int SetProgram( input_thread_t * p_input, - pgrm_descriptor_t * p_program ) + +/* Get the NAME=VALUE part of the Cookie */ +static char * cookie_get_content( const char * cookie ) { - return VLC_SUCCESS; + char * ret = strdup( cookie ); + if( !ret ) return NULL; + char * str = ret; + /* Look for a ';' */ + while( *str && *str != ';' ) str++; + /* Replace it by a end-char */ + if( *str == ';' ) *str = 0; + return ret; } -/***************************************************************************** - * Seek: close and re-open a connection at the right place - *****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_pos ) +/* Get the domain where the cookie is stored */ +static char * cookie_get_domain( const char * cookie ) { - _input_socket_t *p_access_data = (_input_socket_t*)p_input->p_access_data; -#if defined( WIN32 ) || defined( UNDER_CE ) - closesocket( p_access_data->_socket.i_handle ); -#else - close( p_access_data->_socket.i_handle ); -#endif - msg_Dbg( p_input, "seeking to position "I64Fd, i_pos ); - HTTPConnect( p_input, i_pos ); + const char * str = cookie; + static const char domain[] = "domain="; + if( !str ) + return NULL; + /* Look for a ';' */ + while( *str ) + { + if( !strncmp( str, domain, sizeof(domain) - 1 /* minus \0 */ ) ) + { + str += sizeof(domain) - 1 /* minus \0 */; + char * ret = strdup( str ); + /* Now remove the next ';' if present */ + char * ret_iter = ret; + while( *ret_iter && *ret_iter != ';' ) ret_iter++; + if( *ret_iter == ';' ) + *ret_iter = 0; + return ret; + } + /* Go to next ';' field */ + while( *str && *str != ';' ) str++; + if( *str == ';' ) str++; + /* skip blank */ + while( *str && *str == ' ' ) str++; + } + return NULL; } -/***************************************************************************** - * Read: read on a file descriptor, checking b_die periodically - *****************************************************************************/ -static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +/* Get NAME in the NAME=VALUE field */ +static char * cookie_get_name( const char * cookie ) { - input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; - struct timeval timeout; - fd_set fds; - int i_ret; + char * ret = cookie_get_content( cookie ); /* NAME=VALUE */ + if( !ret ) return NULL; + char * str = ret; + while( *str && *str != '=' ) str++; + *str = 0; + return ret; +} - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( p_access_data->i_handle, &fds ); +/* Add a cookie in cookies, checking to see how it should be added */ +static void cookie_append( vlc_array_t * cookies, char * cookie ) +{ + int i; - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + if( !cookie ) + return; - /* Find if some data is available */ - i_ret = select( p_access_data->i_handle + 1, &fds, - NULL, NULL, &timeout ); + char * cookie_name = cookie_get_name( cookie ); -#ifdef HAVE_ERRNO_H - if( i_ret == -1 && errno != EINTR ) - { - msg_Err( p_input, "network select error (%s)", strerror(errno) ); - } -#else - if( i_ret == -1 ) - { - msg_Err( p_input, "network select error" ); - } -#endif - else if( i_ret > 0 ) + /* Don't send invalid cookies */ + if( !cookie_name ) + return; + + char * cookie_domain = cookie_get_domain( cookie ); + for( i = 0; i < vlc_array_count( cookies ); i++ ) { - ssize_t i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 ); + char * current_cookie = vlc_array_item_at_index( cookies, i ); + char * current_cookie_name = cookie_get_name( current_cookie ); + char * current_cookie_domain = cookie_get_domain( current_cookie ); + + assert( current_cookie_name ); + + vlc_bool_t is_domain_matching = ( cookie_domain && current_cookie_domain && + !strcmp( cookie_domain, current_cookie_domain ) ); - if( i_recv < 0 ) + if( is_domain_matching && !strcmp( cookie_name, current_cookie_name ) ) { -#ifdef HAVE_ERRNO_H - msg_Err( p_input, "recv failed (%s)", strerror(errno) ); -#else - msg_Err( p_input, "recv failed" ); -#endif + /* Remove previous value for this cookie */ + free( current_cookie ); + vlc_array_remove( cookies, i ); + + /* Clean */ + free( current_cookie_name ); + free( current_cookie_domain ); + break; } - - return i_recv; + free( current_cookie_name ); + free( current_cookie_domain ); } - - return 0; + free( cookie_name ); + free( cookie_domain ); + vlc_array_append( cookies, cookie ); } +