X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fhttp.c;h=53632e9199383ab5cadffb92aa35bf8b4d6992d4;hb=806cf5165824be921bf2402ecf11fd3ee6501f9c;hp=84b7c36c6d7d8afff2d8996199b89881fffab7cb;hpb=9a35ceb86e119944da5f87c77a3d1b29c5cf1139;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index 84b7c36c6d..53632e9199 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1,11 +1,12 @@ /***************************************************************************** * http.c: HTTP input module ***************************************************************************** - * Copyright (C) 2001-2005 VideoLAN + * Copyright (C) 2001-2005 the VideoLAN team * $Id$ * * 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 @@ -19,21 +20,24 @@ * * 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 "vlc_playlist.h" -#include "vlc_meta.h" -#include "network.h" -#include "vlc_tls.h" + +#include + +#include +#include +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -43,60 +47,58 @@ static void Close( vlc_object_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." ) + "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_( \ - "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 authentication only).") - -#define PASS_TEXT N_("HTTP password") -#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \ - "used for the connection.") + "Caching value for HTTP streams. This " \ + "value should be set in milliseconds." ) #define AGENT_TEXT N_("HTTP user agent") -#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \ +#define AGENT_LONGTEXT N_("User agent that will be " \ "used for the connection.") #define RECONNECT_TEXT N_("Auto re-connect") -#define RECONNECT_LONGTEXT N_("Will automatically attempt a re-connection " \ - "in case it was untimely closed.") +#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_("Enable this option to read a file that is " \ - "being constantly updated (for example, a JPG file on a server)") +#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." ) vlc_module_begin(); set_description( _("HTTP input") ); set_capability( "access2", 0 ); - set_shortname( _( "HTTP/HTTPS" ) ); + 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 ); + change_safe(); 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 ); + change_safe(); add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, VLC_FALSE ); + AGENT_LONGTEXT, VLC_TRUE ); + change_safe(); add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, RECONNECT_LONGTEXT, VLC_TRUE ); + change_safe(); add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, CONTINUOUS_LONGTEXT, VLC_TRUE ); - + change_safe(); + 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(); @@ -111,8 +113,6 @@ struct access_sys_t /* From uri */ vlc_url_t url; - char *psz_user; - char *psz_passwd; char *psz_user_agent; /* Proxy */ @@ -121,7 +121,7 @@ struct access_sys_t /* */ int i_code; - char *psz_protocol; + const char *psz_protocol; int i_version; char *psz_mime; @@ -148,13 +148,12 @@ struct access_sys_t }; /* */ -static int Read( access_t *, uint8_t *, int ); +static ssize_t Read( access_t *, uint8_t *, size_t ); static int Seek( access_t *, int64_t ); static int Control( access_t *, int, va_list ); /* */ -static void ParseURL( access_sys_t *, char *psz_url ); -static int Connect( access_t *, int64_t ); +static int Connect( access_t *, int64_t ); static int Request( access_t *p_access, int64_t i_tell ); static void Disconnect( access_t * ); @@ -165,47 +164,10 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - char *psz; - - /* First set ipv4/ipv6 */ - var_Create( p_access, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_access, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - - if( *p_access->psz_access ) - { - vlc_value_t val; - /* Find out which shortcut was used */ - if( !strncmp( p_access->psz_access, "http4", 6 ) ) - { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv4", val ); - - val.b_bool = VLC_FALSE; - var_Set( p_access, "ipv6", val ); - } - else if( !strncmp( p_access->psz_access, "http6", 6 ) ) - { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv6", val ); - - val.b_bool = VLC_FALSE; - var_Set( p_access, "ipv4", val ); - } - } + char *psz, *p; /* Set up p_access */ - p_access->pf_read = Read; - p_access->pf_block = NULL; - p_access->pf_control = Control; - p_access->pf_seek = Seek; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; - p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); - memset( p_sys, 0, sizeof( access_sys_t ) ); + STANDARD_READ_ACCESS_INIT; p_sys->fd = -1; p_sys->b_proxy = VLC_FALSE; p_sys->i_version = 1; @@ -226,21 +188,13 @@ static int Open( vlc_object_t *p_this ) p_sys->psz_icy_title = NULL; p_sys->i_remaining = 0; - /* Parse URI */ - if( vlc_UrlIsNotEncoded( p_access->psz_path ) ) - { - psz = vlc_UrlEncode( p_access->psz_path ); - if( psz == NULL ) - { - free( p_sys ); - return VLC_ENOMEM; - } - ParseURL( p_sys, psz ); - free( psz ); - } - else - ParseURL( p_sys, p_access->psz_path ); + /* 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' ) { @@ -249,7 +203,7 @@ static int Open( vlc_object_t *p_this ) } if( !strncmp( p_access->psz_access, "https", 5 ) ) { - /* SSL over HTTP */ + /* HTTP over SSL */ p_sys->b_ssl = VLC_TRUE; if( p_sys->url.i_port <= 0 ) p_sys->url.i_port = 443; @@ -259,11 +213,6 @@ static int Open( vlc_object_t *p_this ) if( p_sys->url.i_port <= 0 ) p_sys->url.i_port = 80; } - if( !p_sys->psz_user || *p_sys->psz_user == '\0' ) - { - p_sys->psz_user = var_CreateGetString( p_access, "http-user" ); - p_sys->psz_passwd = var_CreateGetString( p_access, "http-pwd" ); - } /* Do user agent */ p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" ); @@ -308,24 +257,63 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_access, " proxy %s:%d", p_sys->proxy.psz_host, p_sys->proxy.i_port ); } - if( p_sys->psz_user && *p_sys->psz_user ) + if( p_sys->url.psz_username && *p_sys->url.psz_username ) { msg_Dbg( p_access, " user='%s', pwd='%s'", - p_sys->psz_user, p_sys->psz_passwd ); + p_sys->url.psz_username, p_sys->url.psz_password ); } p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" ); p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" ); +connect: /* Connect */ - if( Connect( p_access, 0 ) ) + switch( Connect( p_access, 0 ) ) { - /* Retry with http 1.0 */ - p_sys->i_version = 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; + + if( p_access->b_die || Connect( p_access, 0 ) ) + goto error; + +#ifdef DEBUG + case 0: + break; + + default: + msg_Err( p_access, "You should not be here" ); + abort(); +#endif + } - if( p_access->b_die || - Connect( p_access, 0 ) ) + if( p_sys->i_code == 401 ) + { + 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 ) + { + 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 ); + if( psz_login ) free( psz_login ); + if( psz_password ) free( psz_password ); + goto connect; + } + else { + if( psz_login ) free( psz_login ); + if( psz_password ) free( psz_password ); goto error; } } @@ -334,40 +322,36 @@ static int Open( vlc_object_t *p_this ) p_sys->i_code == 303 || p_sys->i_code == 307 ) && p_sys->psz_location && *p_sys->psz_location ) { - playlist_t * p_playlist; - input_item_t *p_input_item; - msg_Dbg( p_access, "redirection to %s", p_sys->psz_location ); - p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) + /* 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, "redirection failed: can't find playlist" ); + msg_Err( p_access, "insecure redirection ignored" ); goto error; } - - /* Change the uri */ - vlc_mutex_lock( &p_playlist->object_lock ); - p_input_item = &p_playlist->status.p_item->input; - vlc_mutex_lock( &p_input_item->lock ); - free( p_input_item->psz_uri ); + if( p_sys->i_code == 301 ) + { + /* Permanent redirection: Change the URI */ + input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); + if( p_input ) + { + input_item_t * p_input_item = input_GetItem(p_input); + input_item_SetURI( p_input_item, p_sys->psz_location ); + vlc_object_release( p_input ); + } + } free( p_access->psz_path ); - p_input_item->psz_uri = strdup( p_sys->psz_location ); p_access->psz_path = strdup( p_sys->psz_location ); - vlc_mutex_unlock( &p_input_item->lock ); - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - /* Clean up current Open() run */ vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->proxy ); - if( p_sys->psz_mime ) free( p_sys->psz_mime ); - if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); - 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 ); + 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 ); @@ -378,7 +362,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->b_mms ) { - msg_Dbg( p_access, "This is actually a live mms server, BAIL" ); + msg_Dbg( p_access, "this is actually a live mms server, BAIL" ); goto error; } @@ -418,6 +402,14 @@ static int Open( vlc_object_t *p_this ) /* 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" ); @@ -429,12 +421,10 @@ static int Open( vlc_object_t *p_this ) 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_pragma ) free( p_sys->psz_pragma ); - 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 ); + 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 ); @@ -452,18 +442,15 @@ static void Close( vlc_object_t *p_this ) 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 ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); + free( p_sys->psz_location ); - if( p_sys->psz_mime ) free( p_sys->psz_mime ); - if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); - if( p_sys->psz_location ) free( p_sys->psz_location ); + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_title ); - if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name ); - if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre ); - if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title ); - - if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent ); + free( p_sys->psz_user_agent ); Disconnect( p_access ); free( p_sys ); @@ -474,7 +461,7 @@ static void Close( vlc_object_t *p_this ) * p_buffer. Return the actual number of bytes read *****************************************************************************/ static int ReadICYMeta( access_t *p_access ); -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +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; @@ -509,8 +496,9 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /* read the chunk header */ if( psz == NULL ) { + /* fatal error - end of file */ msg_Dbg( p_access, "failed reading chunk-header line" ); - return -1; + return 0; } p_sys->i_chunk = strtoll( psz, NULL, 16 ); free( psz ); @@ -622,43 +610,40 @@ static int ReadICYMeta( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; - uint8_t buffer[1]; - char *psz_meta; + uint8_t buffer; + char *p, *psz_meta; int i_read; - char *p; /* Read meta data length */ - i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, buffer, 1, + 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] <= 0 ) + if( buffer == 0 ) return VLC_SUCCESS; - msg_Dbg( p_access, "ICY meta size=%d", buffer[0] * 16); - - psz_meta = malloc( buffer[0] * 16 + 1 ); - i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, - psz_meta, buffer[0] * 16, VLC_TRUE ); + i_read = buffer << 4; + /* msg_Dbg( p_access, "ICY meta size=%u", i_read); */ - if( i_read != buffer[0] * 16 ) + 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[buffer[0]*16] = '\0'; /* Just in case */ + psz_meta[i_read] = '\0'; /* Just in case */ - msg_Dbg( p_access, "icy-meta=%s", psz_meta ); + /* msg_Dbg( p_access, "icy-meta=%s", psz_meta ); */ /* Now parse the meta */ /* Look for StreamTitle= */ - p = strcasestr( psz_meta, "StreamTitle=" ); + p = strcasestr( (char *)psz_meta, "StreamTitle=" ); if( p ) { p += strlen( "StreamTitle=" ); if( *p == '\'' || *p == '"' ) { - char *psz = strchr( &p[1], p[0] ); + char closing[] = { p[0], ';', '\0' }; + char *psz = strstr( &p[1], closing ); if( !psz ) psz = strchr( &p[1], ';' ); @@ -670,17 +655,19 @@ static int ReadICYMeta( access_t *p_access ) if( psz ) *psz = '\0'; } - if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title ); - - p_sys->psz_icy_title = strdup( &p[1] ); + if( !p_sys->psz_icy_title || + strcmp( p_sys->psz_icy_title, &p[1] ) ) + { + if( p_sys->psz_icy_title ) + free( p_sys->psz_icy_title ); + p_sys->psz_icy_title = strdup( &p[1] ); + p_access->info.i_update |= INPUT_UPDATE_META; - p_access->info.i_update |= INPUT_UPDATE_META; + msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); + } } - free( psz_meta ); - msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title ); - return VLC_SUCCESS; } @@ -711,7 +698,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) vlc_bool_t *pb_bool; int *pi_int; int64_t *pi_64; - vlc_meta_t **pp_meta; + vlc_meta_t *p_meta; switch( i_query ) { @@ -751,19 +738,19 @@ static int Control( access_t *p_access, int i_query, va_list args ) break; case ACCESS_GET_META: - pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); - *pp_meta = vlc_meta_New(); - msg_Dbg( p_access, "GET META %s %s %s", - p_sys->psz_icy_name, p_sys->psz_icy_genre, p_sys->psz_icy_title ); + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + if( p_sys->psz_icy_name ) - vlc_meta_Add( *pp_meta, VLC_META_TITLE, - 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_Add( *pp_meta, VLC_META_GENRE, - 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_Add( *pp_meta, VLC_META_NOW_PLAYING, - 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: @@ -780,54 +767,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) return VLC_SUCCESS; } -/***************************************************************************** - * 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; - - /* Syntax //[user:password]@[:][/] */ - while( *p == '/' ) - { - p++; - } - psz = p; - - /* Parse auth */ - if( ( p = strchr( psz, '@' ) ) ) - { - char *comma; - - *p++ = '\0'; - comma = strchr( psz, ':' ); - - /* Retreive user:password */ - if( comma ) - { - *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 ); - - free( psz_dup ); -} - /***************************************************************************** * Connect: *****************************************************************************/ @@ -837,13 +776,13 @@ static int Connect( access_t *p_access, int64_t i_tell ) vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; /* Clean info */ - if( p_sys->psz_location ) free( p_sys->psz_location ); - if( p_sys->psz_mime ) free( p_sys->psz_mime ); - if( p_sys->psz_pragma ) free( p_sys->psz_pragma ); + free( p_sys->psz_location ); + free( p_sys->psz_mime ); + free( p_sys->psz_pragma ); - if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre ); - if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name ); - if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title ); + free( p_sys->psz_icy_genre ); + free( p_sys->psz_icy_name ); + free( p_sys->psz_icy_title ); p_sys->psz_location = NULL; @@ -863,11 +802,11 @@ static int Connect( access_t *p_access, int64_t i_tell ) /* Open connection */ - p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port ); - if( p_sys->fd < 0 ) + p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); + if( p_sys->fd == -1 ) { msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port ); - return VLC_EGENERIC; + return -1; } /* Initialize TLS/SSL session */ @@ -883,7 +822,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) { /* CONNECT is not in HTTP/1.0 */ Disconnect( p_access ); - return VLC_EGENERIC; + return -1; } net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, @@ -897,7 +836,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) { msg_Err( p_access, "cannot establish HTTP/TLS tunnel" ); Disconnect( p_access ); - return VLC_EGENERIC; + return -1; } sscanf( psz, "HTTP/%*u.%*u %3u", &i_status ); @@ -907,7 +846,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) { msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" ); Disconnect( p_access ); - return VLC_EGENERIC; + return -1; } do @@ -917,7 +856,7 @@ static int Connect( access_t *p_access, int64_t i_tell ) { msg_Err( p_access, "HTTP proxy connection failed" ); Disconnect( p_access ); - return VLC_EGENERIC; + return -1; } if( *psz == '\0' ) @@ -935,12 +874,12 @@ static int Connect( access_t *p_access, int64_t i_tell ) { msg_Err( p_access, "cannot establish HTTP/TLS session" ); Disconnect( p_access ); - return VLC_EGENERIC; + return -1; } p_sys->p_vs = &p_sys->p_tls->sock; } - return Request( p_access, i_tell ); + return Request( p_access, i_tell ) ? -2 : 0; } @@ -952,7 +891,6 @@ static int Request( access_t *p_access, int64_t i_tell ) if( p_sys->b_proxy ) { - /* FIXME: support SSL proxies */ if( p_sys->url.psz_path ) { net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, @@ -970,7 +908,7 @@ static int Request( access_t *p_access, int64_t i_tell ) } else { - char *psz_path = p_sys->url.psz_path; + const char *psz_path = p_sys->url.psz_path; if( !psz_path || !*psz_path ) { psz_path = "/"; @@ -999,37 +937,57 @@ static int Request( access_t *p_access, int64_t i_tell ) "Range: bytes="I64Fd"-\r\n", i_tell ); } - /* Authentification */ - if( p_sys->psz_user && *p_sys->psz_user ) + /* Authentication */ + if( p_sys->url.psz_username || p_sys->url.psz_password ) { - char *buf; + char buf[strlen( p_sys->url.psz_username ?: "" ) + + strlen( p_sys->url.psz_password ?: "" ) + 2]; char *b64; - asprintf( &buf, "%s:%s", p_sys->psz_user, - p_sys->psz_passwd ? p_sys->psz_passwd : "" ); + snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "", + p_sys->url.psz_password ?: "" ); + b64 = vlc_b64_encode( buf ); + + if( b64 != NULL ) + { + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Authorization: Basic %s\r\n", b64 ); + free( b64 ); + } + } + + /* Proxy Authentication */ + if( p_sys->proxy.psz_username || p_sys->proxy.psz_password ) + { + char buf[strlen( p_sys->proxy.psz_username ?: "" ) + + strlen( p_sys->proxy.psz_password ?: "" )]; + char *b64; + snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "", + p_sys->proxy.psz_password ?: "" ); b64 = vlc_b64_encode( buf ); - free( buf ); - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Authorization: Basic %s\r\n", b64 ); - free( b64 ); + if( b64 != NULL) + { + net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + "Proxy-Authorization: Basic %s\r\n", b64 ); + free( b64 ); + } } /* ICY meta data request */ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" ); - if( p_sys->b_continuous && p_sys->i_version == 1 ) + if( p_sys->b_continuous ) { net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, - "Connection: keep-alive\r\n" ); + "Connection: Keep-Alive\r\n" ); } - else + else if( p_sys->i_version == 1 ) { - net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, + net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs, "Connection: Close\r\n"); - p_sys->b_continuous = VLC_FALSE; } if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 ) @@ -1068,11 +1026,17 @@ static int Request( access_t *p_access, int64_t i_tell ) { p_sys->b_seekable = VLC_FALSE; } - if( p_sys->i_code != 206 ) + if( p_sys->i_code != 206 && p_sys->i_code != 401 ) { p_sys->b_seekable = VLC_FALSE; } - if( p_sys->i_code >= 400 ) + /* Authentication error - We'll have to display the dialog */ + if( p_sys->i_code == 401 ) + { + + } + /* Other fatal error */ + else if( p_sys->i_code >= 400 ) { msg_Err( p_access, "error: %s", psz ); free( psz ); @@ -1113,7 +1077,7 @@ static int Request( access_t *p_access, int64_t i_tell ) if( p_sys->b_continuous ) { p_access->info.i_size = -1; - msg_Dbg( p_access, "this frame size="I64Fd, atoll(p ) ); + msg_Dbg( p_access, "this frame size=%lld", atoll(p ) ); p_sys->i_remaining = atoll( p ); } else @@ -1124,8 +1088,32 @@ static int Request( access_t *p_access, int64_t i_tell ) } else if( !strcasecmp( psz, "Location" ) ) { + char * psz_new_loc; + + /* 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( p_sys->url.i_port == ( p_sys->b_ssl ? 443 : 80 ) ) + { + asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext, + p_sys->url.psz_host, p); + } + else + { + asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext, + p_sys->url.psz_host, p_sys->url.i_port, p); + } + } + else + { + psz_new_loc = strdup( p ); + } + if( p_sys->psz_location ) free( p_sys->psz_location ); - p_sys->psz_location = strdup( p ); + p_sys->psz_location = psz_new_loc; } else if( !strcasecmp( psz, "Content-Type" ) ) { @@ -1230,5 +1218,5 @@ static void Disconnect( access_t *p_access ) net_Close(p_sys->fd); p_sys->fd = -1; } - + }