X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=a91a2c55dbd7cda7ac4f840d5a243bd7db23bee8;hb=577e22f22518917210d9a4b0bae4fa05621c99da;hp=468867476380ffb28fc339865f20dd63c6388b8c;hpb=2799d36bc8abdc28df29a202acdb27223b25a7a7;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index 4688674763..a91a2c55db 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,16 +1,17 @@ /***************************************************************************** - * http.c: HTTP access plug-in + * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: http.c,v 1.4 2002/09/30 11:05:34 sam Exp $ + * Copyright (C) 2001-2004 VideoLAN + * $Id: http.c,v 1.59 2004/02/24 16:31:46 fenrir Exp $ * - * Authors: Christophe Massiot + * Authors: Laurent Aimar + * Christophe Massiot * * 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 @@ -25,48 +26,55 @@ * Preamble *****************************************************************************/ #include -#include -#include -#include -#include -#include #include #include -#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 "vlc_playlist.h" #include "network.h" /***************************************************************************** - * Local prototypes + * Module descriptor *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); -static int SetProgram ( input_thread_t *, pgrm_descriptor_t * ); -static void Seek ( input_thread_t *, off_t ); +#define PROXY_TEXT N_("HTTP proxy") +#define PROXY_LONGTEXT N_( \ + "You can specify an HTTP proxy to use. It must be of the form " \ + "http://myproxy.mydomain:myport/. If none is specified, the HTTP_PROXY " \ + "environment variable will be tried." ) + +#define CACHING_TEXT N_("Caching value in ms") +#define CACHING_LONGTEXT N_( \ + "Allows you to modify the default caching value for http streams. This " \ + "value should be set in millisecond units." ) + +#define USER_TEXT N_("HTTP user name") +#define USER_LONGTEXT N_("Allows you to modify the user name that will " \ + "be used for the connection (Basic authentification only).") + +#define PASS_TEXT N_("HTTP password") +#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \ + "used for the connection.") + +#define AGENT_TEXT N_("HTTP user agent") +#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \ + "used for the connection.") -/***************************************************************************** - * Module descriptor - *****************************************************************************/ vlc_module_begin(); - set_description( _("HTTP access module") ); + set_description( _("HTTP input") ); set_capability( "access", 0 ); + + 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", NULL, NULL, USER_TEXT, USER_LONGTEXT, VLC_FALSE ); + add_string( "http-pwd", NULL , NULL, PASS_TEXT, PASS_LONGTEXT, VLC_FALSE ); + add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, + AGENT_LONGTEXT, VLC_FALSE ); + add_shortcut( "http" ); add_shortcut( "http4" ); add_shortcut( "http6" ); @@ -74,431 +82,652 @@ vlc_module_begin(); vlc_module_end(); /***************************************************************************** - * _input_socket_t: private access plug-in data, modified to add private - * fields + * Local prototypes *****************************************************************************/ -typedef struct _input_socket_s +struct access_sys_t { - input_socket_t _socket; + int fd; + + /* From uri */ + vlc_url_t url; + char *psz_user; + char *psz_passwd; + char *psz_user_agent; - char * psz_network; - network_socket_t socket_desc; - char psz_buffer[256]; - char * psz_name; -} _input_socket_t; + /* Proxy */ + vlc_bool_t b_proxy; + vlc_url_t proxy; + + /* */ + int i_code; + char *psz_protocol; + int i_version; + + char *psz_mime; + char *psz_location; + + vlc_bool_t b_chunked; + int64_t i_chunk; + int64_t i_tell; + int64_t i_size; +}; + +static void Seek( input_thread_t *, off_t ); +static ssize_t Read( input_thread_t *, byte_t *, size_t ); + +static void ParseURL( access_sys_t *, char *psz_url ); +static int Connect( input_thread_t *, vlc_bool_t *, off_t *, off_t ); + +static char *b64_encode( unsigned char *src ); /***************************************************************************** - * 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 ) { - _input_socket_t * p_access_data; - module_t * p_network; - char psz_buffer[256]; - byte_t * psz_parser; - int i_returncode, i; - char * psz_return_alpha; + input_thread_t *p_input = (input_thread_t*)p_this; + access_sys_t *p_sys; + vlc_value_t val; + + /* Create private struct */ + p_sys = p_input->p_access_data = malloc( sizeof( access_sys_t ) ); + memset( p_sys, 0, sizeof( access_sys_t ) ); + p_sys->fd = -1; + p_sys->b_proxy = VLC_FALSE; + p_sys->i_version = 1; + p_sys->psz_mime = NULL; + p_sys->psz_location = NULL; + p_sys->psz_user_agent = NULL; + + /* First set ipv4/ipv6 */ + var_Create( p_input, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - /* 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 ) + if( *p_input->psz_access ) { - return( -1 ); - } - module_Unneed( p_input, p_network ); + /* Find out which shortcut was used */ + if( !strncmp( p_input->psz_access, "http4", 6 ) ) + { + val.b_bool = VLC_TRUE; + var_Set( p_input, "ipv4", val ); - p_access_data->_socket.i_handle = p_access_data->socket_desc.i_handle; + val.b_bool = VLC_FALSE; + var_Set( p_input, "ipv6", val ); + } + else if( !strncmp( p_input->psz_access, "http6", 6 ) ) + { + val.b_bool = VLC_TRUE; + var_Set( p_input, "ipv6", val ); -# define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n" -# define HTTP_END "\r\n" - - if ( p_input->stream.b_seekable ) - { - snprintf( psz_buffer, sizeof(psz_buffer), - "%s" - "Range: bytes=%d%d-\r\n" - HTTP_USERAGENT HTTP_END, - p_access_data->psz_buffer, - (u32)(i_tell>>32), (u32)i_tell ); + val.b_bool = VLC_FALSE; + var_Set( p_input, "ipv4", val ); + } } - else + + /* Parse URI */ + ParseURL( p_sys, p_input->psz_name ); + if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' ) { - snprintf( psz_buffer, sizeof(psz_buffer), - "%s" - HTTP_USERAGENT HTTP_END, - p_access_data->psz_buffer ); + msg_Warn( p_input, "invalid host" ); + goto error; } - psz_buffer[sizeof(psz_buffer) - 1] = '\0'; - - /* Send GET ... */ - if( send( p_access_data->_socket.i_handle, psz_buffer, - strlen( psz_buffer ), 0 ) == (-1) ) + if( p_sys->url.i_port <= 0 ) { - msg_Err( p_input, "cannot send request (%s)", strerror(errno) ); - input_FDNetworkClose( p_input ); - return( -1 ); + p_sys->url.i_port = 80; } + if( !p_sys->psz_user || *p_sys->psz_user == '\0' ) + { + var_Create( p_input, "http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_input, "http-user", &val ); + p_sys->psz_user = val.psz_string; - /* Prepare the input thread for reading. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; + var_Create( p_input, "http-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_input, "http-pwd", &val ); + p_sys->psz_passwd = val.psz_string; + } - /* 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 = input_FDNetworkRead; + /* Do user agent */ + var_Create( p_input, "http-user-agent", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_input, "http-user-agent", &val ); + p_sys->psz_user_agent = val.psz_string; - while( !input_FillBuffer( p_input ) ) + /* Check proxy */ + var_Create( p_input, "http-proxy", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_input, "http-proxy", &val ); + if( val.psz_string && *val.psz_string ) { - if( p_input->b_die || p_input->b_error ) + p_sys->b_proxy = VLC_TRUE; + vlc_UrlParse( &p_sys->proxy, val.psz_string, 0 ); + } + else + { + char *psz_proxy = getenv( "http_proxy" ); + if( psz_proxy && *psz_proxy ) + { + p_sys->b_proxy = VLC_TRUE; + vlc_UrlParse( &p_sys->proxy, val.psz_string, 0 ); + } + if( psz_proxy ) { - input_FDNetworkClose( p_input ); - return( -1 ); + free( psz_proxy ); } } - - /* Parse HTTP header. */ -#define MAX_LINE 1024 - - /* get the returncode */ - if( input_Peek( p_input, &psz_parser, MAX_LINE ) <= 0 ) + if( val.psz_string ) { - msg_Err( p_input, "not enough data" ); - input_FDNetworkClose( p_input ); - return( -1 ); + free( val.psz_string ); } - if( !strncmp( psz_parser, "HTTP/1.", - strlen("HTTP/1.") ) ) + if( p_sys->b_proxy ) { - psz_parser += strlen("HTTP 1.") + 2; - i_returncode = atoi( (char*)psz_parser ); - msg_Dbg( p_input, "HTTP server replied: %i", i_returncode ); - psz_parser += 4; - for ( i = 0; psz_parser[i] != '\r' || psz_parser[i+1] != '\n'; i++ ) + if( p_sys->proxy.psz_host == NULL || *p_sys->proxy.psz_host == '\0' ) + { + msg_Warn( p_input, "invalid proxy host" ); + goto error; + } + if( p_sys->proxy.i_port <= 0 ) { - ; + p_sys->proxy.i_port = 80; } - psz_return_alpha = malloc( i + 1 ); - memcpy( psz_return_alpha, psz_parser, i ); - psz_return_alpha[i] = '\0'; } - else + + msg_Dbg( p_input, "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_Err( p_input, "invalid http reply" ); - return -1; + msg_Dbg( p_input, " proxy %s:%d", p_sys->proxy.psz_host, + p_sys->proxy.i_port ); } - - if ( i_returncode >= 400 ) /* something is wrong */ + if( p_sys->psz_user && *p_sys->psz_user ) { - msg_Err( p_input, "%i %s", i_returncode, - psz_return_alpha ); - return -1; + msg_Dbg( p_input, " user='%s', pwd='%s'", + p_sys->psz_user, p_sys->psz_passwd ); } - - for( ; ; ) + + /* Connect */ + if( Connect( p_input, &p_input->stream.b_seekable, + &p_input->stream.p_selected_area->i_size, 0 ) ) { - if( input_Peek( p_input, &psz_parser, MAX_LINE ) <= 0 ) + /* Retry with http 1.0 */ + p_sys->i_version = 0; + + if( p_input->b_die || + Connect( p_input, &p_input->stream.b_seekable, + &p_input->stream.p_selected_area->i_size, 0 ) ) { - msg_Err( p_input, "not enough data" ); - input_FDNetworkClose( p_input ); - return( -1 ); + goto error; } + } - if( psz_parser[0] == '\r' && psz_parser[1] == '\n' ) + 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 ) + { + playlist_t * p_playlist; + + msg_Dbg( p_input, "redirection to %s", p_sys->psz_location ); + + p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); + if( !p_playlist ) { - /* End of header. */ - p_input->p_current_data += 2; - break; + msg_Err( p_input, "redirection failed: can't find playlist" ); + goto error; } + p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE; + playlist_Add( p_playlist, p_sys->psz_location, p_sys->psz_location, + PLAYLIST_INSERT | PLAYLIST_GO, + p_playlist->i_index + 1 ); + vlc_object_release( p_playlist ); + + p_sys->i_size = 0; /* Force to stop reading */ + } + + /* Finish to set up p_input */ + p_input->pf_read = Read; + p_input->pf_set_program = input_SetProgram; + p_input->pf_set_area = NULL; + p_input->pf_seek = Seek; - if( !strncmp( psz_parser, "Content-Length: ", - strlen("Content-Length: ") ) ) + vlc_mutex_lock( &p_input->stream.stream_lock ); + p_input->stream.b_pace_control = VLC_TRUE; + 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 ); + p_input->i_mtu = 0; + if( !strcmp( p_sys->psz_protocol, "ICY" ) && + ( !p_input->psz_demux || !*p_input->psz_demux ) ) + { + if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "video/nsv" ) ) { - psz_parser += strlen("Content-Length: "); - vlc_mutex_lock( &p_input->stream.stream_lock ); -#ifdef HAVE_ATOLL - p_input->stream.p_selected_area->i_size = atoll( (char*)psz_parser ) - + i_tell; -#else - /* FIXME : this won't work for 64-bit lengths */ - p_input->stream.p_selected_area->i_size = atoi( (char*)psz_parser ) - + i_tell; -#endif - vlc_mutex_unlock( &p_input->stream.stream_lock ); + p_input->psz_demux = strdup( "nsv" ); } - - while( *psz_parser != '\r' && psz_parser < p_input->p_last_data ) + else { - psz_parser++; + p_input->psz_demux = strdup( "mp3" ); } - p_input->p_current_data = psz_parser + 2; + msg_Info( p_input, "ICY server found, %s demuxer selected", + p_input->psz_demux ); } - if( p_input->stream.p_selected_area->i_size ) + /* Update default_pts to a suitable value for http access */ + var_Create( p_input, "http-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Get( p_input, "http-caching", &val ); + p_input->i_pts_delay = val.i_int * 1000; + + return VLC_SUCCESS; + +error: + vlc_UrlClean( &p_sys->url ); + vlc_UrlClean( &p_sys->proxy ); + if( p_sys->psz_mime ) free( p_sys->psz_mime ); + if( p_sys->psz_location ) free( p_sys->psz_location ); + if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent ); + if( p_sys->psz_user ) free( p_sys->psz_user ); + if( p_sys->psz_passwd ) free( p_sys->psz_passwd ); + + if( p_sys->fd > 0 ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_tell = i_tell - + (p_input->p_last_data - p_input->p_current_data); - p_input->stream.b_seekable = 1; - p_input->stream.b_changed = 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + net_Close( p_sys->fd ); } + free( p_sys ); + return VLC_EGENERIC; +} - return( 0 ); +/***************************************************************************** + * Close: + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + input_thread_t *p_input = (input_thread_t*)p_this; + access_sys_t *p_sys = p_input->p_access_data; + + vlc_UrlClean( &p_sys->url ); + vlc_UrlClean( &p_sys->proxy ); + + if( p_sys->psz_user ) free( p_sys->psz_user ); + if( p_sys->psz_passwd ) free( p_sys->psz_passwd ); + + if( p_sys->psz_mime ) free( p_sys->psz_mime ); + if( p_sys->psz_location ) free( p_sys->psz_location ); + + if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent ); + + if( p_sys->fd > 0 ) + { + net_Close( p_sys->fd ); + } + free( p_sys ); } /***************************************************************************** - * Open: parse URL and open the remote file at the beginning + * Seek: close and re-open a connection at the right place *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +static void Seek( input_thread_t * p_input, off_t i_pos ) { - 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; - int i_server_port = 0; + access_sys_t *p_sys = p_input->p_access_data; + + msg_Dbg( p_input, "trying to seek to "I64Fd, i_pos ); + + net_Close( p_sys->fd ); p_sys->fd = -1; - p_access_data = malloc( sizeof(_input_socket_t) ); - p_input->p_access_data = (access_sys_t *)p_access_data; - if( p_access_data == NULL ) + if( Connect( p_input, &p_input->stream.b_seekable, + &p_input->stream.p_selected_area->i_size, i_pos ) ) { - msg_Err( p_input, "out of memory" ); - free(psz_name); - return( -1 ); + msg_Err( p_input, "seek failed" ); } - p_access_data->psz_name = psz_name; - p_access_data->psz_network = ""; - if( config_GetInt( p_input, "ipv4" ) ) + vlc_mutex_lock( &p_input->stream.stream_lock ); + p_input->stream.p_selected_area->i_tell = i_pos; + vlc_mutex_unlock( &p_input->stream.stream_lock ); +} + +/***************************************************************************** + * Read: Read up to i_len bytes from the http connection and place in + * p_buffer. Return the actual number of bytes read + *****************************************************************************/ +static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len ) +{ + access_sys_t *p_sys = p_input->p_access_data; + int i_read; + + if( p_sys->fd < 0 ) { - p_access_data->psz_network = "ipv4"; + return -1; } - if( config_GetInt( p_input, "ipv6" ) ) + if( p_sys->i_size > 0 && i_len + p_sys->i_tell > p_sys->i_size ) { - p_access_data->psz_network = "ipv6"; + if( ( i_len = p_sys->i_size - p_sys->i_tell ) == 0 ) + { + return 0; + } } - if( *p_input->psz_access ) + if( p_sys->b_chunked ) { - /* Find out which shortcut was used */ - if( !strncmp( p_input->psz_access, "http6", 6 ) ) + if( p_sys->i_chunk < 0 ) { - p_access_data->psz_network = "ipv6"; + return 0; } - else if( !strncmp( p_input->psz_access, "http4", 6 ) ) + + if( p_sys->i_chunk <= 0 ) { - p_access_data->psz_network = "ipv4"; + char *psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ); + /* read the chunk header */ + if( psz == NULL ) + { + msg_Dbg( p_input, "failed reading chunk-header line" ); + return -1; + } + p_sys->i_chunk = strtoll( psz, NULL, 16 ); + free( psz ); + + if( p_sys->i_chunk <= 0 ) /* eof */ + { + p_sys->i_chunk = -1; + return 0; + } + } + + if( i_len > p_sys->i_chunk ) + { + i_len = p_sys->i_chunk; } } - /* Parse psz_name syntax : - * //[:][/] */ - while( *psz_parser == '/' ) + + i_read = net_Read( p_input, p_sys->fd, p_buffer, i_len, VLC_FALSE ); + if( i_read > 0 ) { - psz_parser++; + p_sys->i_tell += i_read; + + if( p_sys->b_chunked ) + { + p_sys->i_chunk -= i_read; + if( p_sys->i_chunk <= 0 ) + { + /* read the empty line */ + char *psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ); + if( psz ) + { + free( psz ); + } + } + } } - psz_server_addr = psz_parser; + return i_read; +} + +/***************************************************************************** + * ParseURL: extract user:password + *****************************************************************************/ +static void ParseURL( access_sys_t *p_sys, char *psz_url ) +{ + char *psz_dup = strdup( psz_url ); + char *p = psz_dup; + char *psz; - while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) + /* Syntax //[user:password]@[:][/] */ + while( *p == '/' ) { - psz_parser++; + p++; } + psz = p; - if ( *psz_parser == ':' ) + /* Parse auth */ + if( ( p = strchr( psz, '@' ) ) ) { - *psz_parser = '\0'; - psz_parser++; - psz_server_port = psz_parser; + char *comma; - while( *psz_parser && *psz_parser != '/' ) + *p++ = '\0'; + comma = strchr( psz, ':' ); + + /* Retreive user:password */ + if( comma ) { - psz_parser++; + *comma++ = '\0'; + + p_sys->psz_user = strdup( psz ); + p_sys->psz_passwd = strdup( comma ); + } + else + { + p_sys->psz_user = strdup( psz ); } } + else + { + p = psz; + } + + /* Parse uri */ + vlc_UrlParse( &p_sys->url, p, 0 ); - if( *psz_parser == '/' ) + free( psz_dup ); +} + +/***************************************************************************** + * Connect: + *****************************************************************************/ +static int Connect( input_thread_t *p_input, vlc_bool_t *pb_seekable, + off_t *pi_size, off_t i_tell ) +{ + access_sys_t *p_sys = p_input->p_access_data; + vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; + char *psz; + + /* Clean info */ + if( p_sys->psz_location ) free( p_sys->psz_location ); + if( p_sys->psz_mime ) free( p_sys->psz_mime ); + + p_sys->psz_location = NULL; + p_sys->psz_mime = NULL; + p_sys->b_chunked = VLC_FALSE; + p_sys->i_chunk = 0; + p_sys->i_size = -1; + p_sys->i_tell = i_tell; + + + /* Open connection */ + p_sys->fd = net_OpenTCP( p_input, srv.psz_host, srv.i_port ); + if( p_sys->fd < 0 ) { - *psz_parser = '\0'; - psz_parser++; - psz_path = psz_parser; + msg_Err( p_input, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); + return VLC_EGENERIC; } - /* Convert port format */ - if( *psz_server_port ) + if( p_sys->b_proxy ) { - i_server_port = strtol( psz_server_port, &psz_parser, 10 ); - if( *psz_parser ) + net_Printf( VLC_OBJECT(p_input), p_sys->fd, + "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 + { + char *psz_path = p_sys->url.psz_path; + if( !psz_path || !*psz_path ) { - msg_Err( p_input, "cannot parse server port near %s", psz_parser ); - free( p_input->p_access_data ); - free( psz_name ); - return( -1 ); + psz_path = "/"; } + net_Printf( VLC_OBJECT(p_input), p_sys->fd, + "GET %s HTTP/1.%d\r\nHost: %s\r\n", + psz_path, p_sys->i_version, p_sys->url.psz_host ); + } + /* User Agent */ + net_Printf( VLC_OBJECT(p_input), p_sys->fd, "User-Agent: %s\r\n", + p_sys->psz_user_agent ); + /* Offset */ + if( p_sys->i_version == 1 ) + { + net_Printf( VLC_OBJECT(p_input), p_sys->fd, + "Range: bytes="I64Fd"-\r\n", i_tell ); } + /* Authentification */ + if( p_sys->psz_user && *p_sys->psz_user ) + { + char *buf; + char *b64; + + asprintf( &buf, "%s:%s", p_sys->psz_user, + p_sys->psz_passwd ? p_sys->psz_passwd : "" ); + + b64 = b64_encode( buf ); + + net_Printf( VLC_OBJECT(p_input), p_sys->fd, + "Authorization: Basic %s", b64 ); + free( b64 ); + } + net_Printf( VLC_OBJECT(p_input), p_sys->fd, "Connection: Close\r\n" ); - if( i_server_port == 0 ) + if( net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ) < 0 ) { - i_server_port = 80; + msg_Err( p_input, "failed to send request" ); + net_Close( p_sys->fd ); p_sys->fd = -1; + return VLC_EGENERIC; } - if( !*psz_server_addr ) + /* Set values */ + *pb_seekable = p_sys->i_version == 1 ? VLC_TRUE : VLC_FALSE; + *pi_size = 0; + + /* Read Answer */ + if( ( psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ) ) == NULL ) + { + msg_Err( p_input, "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] ); + } + else + { + msg_Err( p_input, "invalid HTTP reply '%s'", psz ); + free( psz ); + goto error; + } + msg_Dbg( p_input, "protocol '%s' answer code %d", + p_sys->psz_protocol, p_sys->i_code ); + if( !strcmp( p_sys->psz_protocol, "ICY" ) ) { - msg_Err( p_input, "no server given" ); - free( p_input->p_access_data ); - free( psz_name ); - return( -1 ); + *pb_seekable = VLC_FALSE; } + if( p_sys->i_code != 206 ) + { + *pb_seekable = VLC_FALSE; + } + if( p_sys->i_code >= 400 ) + { + msg_Err( p_input, "error: %s", psz ); + free( psz ); + goto error; + } + free( psz ); - /* Check proxy */ - if( (psz_proxy = getenv( "http_proxy" )) != NULL && *psz_proxy ) + for( ;; ) { - /* http://myproxy.mydomain:myport/ */ - int i_proxy_port = 0; - - /* Skip the protocol name */ - while( *psz_proxy && *psz_proxy != ':' ) + char *psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ); + char *p; + + if( psz == NULL ) { - psz_proxy++; + msg_Err( p_input, "failed to read answer" ); + 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; - - /* Skip the hostname part */ - while( *psz_port && *psz_port != ':' && *psz_port != '/' ) - { - psz_port++; - } - - /* Found a port name */ - if( *psz_port ) - { - char * psz_junk; - - /* Replace ':' with '\0' */ - *psz_port = '\0'; - psz_port++; - - psz_junk = psz_port; - while( *psz_junk && *psz_junk != '/' ) - { - psz_junk++; - } - - if( *psz_junk ) - { - *psz_junk = '\0'; - } - - if( *psz_port != '\0' ) - { - i_proxy_port = atoi( psz_port ); - } - } + msg_Err( p_input, "malformed header line: %s", psz ); + free( psz ); + goto error; } - else + *p++ = '\0'; + while( *p == ' ' ) p++; + + if( !strcasecmp( psz, "Content-Length" ) ) { - msg_Err( p_input, "http_proxy environment variable is invalid!" ); - free( p_input->p_access_data ); - free( psz_name ); - return( -1 ); + *pi_size = p_sys->i_size = i_tell + atoll( p ); + msg_Dbg( p_input, "stream size="I64Fd, p_sys->i_size ); + } + else if( !strcasecmp( psz, "Location" ) ) + { + if( p_sys->psz_location ) free( p_sys->psz_location ); + p_sys->psz_location = strdup( p ); + } + else if( !strcasecmp( psz, "Content-Type" ) ) + { + if( p_sys->psz_mime ) free( p_sys->psz_mime ); + p_sys->psz_mime = strdup( p ); + msg_Dbg( p_input, "Content-Type: %s", p_sys->psz_mime ); + } + else if( !strcasecmp( psz, "Transfer-Encoding" ) ) + { + msg_Dbg( p_input, "Transfer-Encoding: %s", p ); + if( !strncasecmp( p, "chunked", 7 ) ) + { + p_sys->b_chunked = VLC_TRUE; + } } - p_access_data->socket_desc.i_type = NETWORK_TCP; - p_access_data->socket_desc.psz_server_addr = psz_proxy; - p_access_data->socket_desc.i_server_port = i_proxy_port; - - snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer), - "GET http://%s:%d/%s\r\n HTTP/1.0\r\n", - psz_server_addr, i_server_port, psz_path ); + free( psz ); } - 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; + return VLC_SUCCESS; - snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer), - "GET /%s HTTP/1.1\r\nHost: %s\r\n", - psz_path, psz_server_addr ); - } - p_access_data->psz_buffer[sizeof(p_access_data->psz_buffer) - 1] = '\0'; +error: + net_Close( p_sys->fd ); p_sys->fd = -1; + return VLC_EGENERIC; +} - msg_Dbg( p_input, "opening server=%s port=%d path=%s", - psz_server_addr, i_server_port, psz_path ); +/***************************************************************************** + * b64_encode: + *****************************************************************************/ +static char *b64_encode( unsigned char *src ) +{ + static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - p_input->pf_read = input_FDNetworkRead; - p_input->pf_set_program = SetProgram; - p_input->pf_set_area = NULL; - p_input->pf_seek = Seek; + char *dst = malloc( strlen( src ) * 4 / 3 + 12 ); + char *ret = dst; + unsigned i_bits = 0; + unsigned i_shift = 0; - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_pace_control = 1; - p_input->stream.b_seekable = 1; - 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; - - if( HTTPConnect( p_input, 0 ) ) + for( ;; ) { - char * psz_pos = strstr(p_access_data->psz_buffer, "HTTP/1.1"); - p_input->stream.b_seekable = 0; - psz_pos[7] = '0'; - if( HTTPConnect( p_input, 0 ) ) + if( *src ) { - free( p_input->p_access_data ); - free( psz_name ); - return( -1 ); + i_bits = ( i_bits << 8 )|( *src++ ); + i_shift += 8; + } + else if( i_shift > 0 ) + { + i_bits <<= 6 - i_shift; + i_shift = 6; + } + else + { + *dst++ = '='; + break; } - } - return 0; -} - -/***************************************************************************** - * Close: free unused data structures - *****************************************************************************/ -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; - free( p_access_data->psz_name ); - input_FDNetworkClose( p_input ); -} + while( i_shift >= 6 ) + { + i_shift -= 6; + *dst++ = b64[(i_bits >> i_shift)&0x3f]; + } + } -/***************************************************************************** - * SetProgram: do nothing - *****************************************************************************/ -static int SetProgram( input_thread_t * p_input, - pgrm_descriptor_t * p_program ) -{ - return( 0 ); -} + *dst++ = '\0'; -/***************************************************************************** - * Seek: close and re-open a connection at the right place - *****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_pos ) -{ - _input_socket_t *p_access_data = (_input_socket_t*)p_input->p_access_data; - close( p_access_data->_socket.i_handle ); - msg_Dbg( p_input, "seeking to position %lld", i_pos ); - HTTPConnect( p_input, i_pos ); + return ret; } -