X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fhttp.c;h=651e250647375474f71879f2d480bd2cb3b3d7f4;hb=6a46d6cc7e08e0a913e3d17db274f57791df8301;hp=fc62ba25ac53387065ef9b28069e9dfdce95b04b;hpb=8e8e64419dbc027b464e227b7d1b4f6056394ebb;p=vlc diff --git a/modules/access/http.c b/modules/access/http.c index fc62ba25ac..651e250647 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -26,17 +26,21 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#define _GNU_SOURCE +#include + +#include #include -#include -#include +#include -#include "vlc_interaction.h" -#include "vlc_playlist.h" -#include "vlc_meta.h" -#include "network.h" -#include "vlc_url.h" -#include "vlc_tls.h" +#include +#include +#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -46,25 +50,27 @@ 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 proxy to be usesd 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." ) + "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." ) +/// \bug missing space before you should #define CONTINUOUS_TEXT N_("Continuous stream") -#define CONTINUOUS_LONGTEXT N_("This allows you to read a file that is " \ +#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." ) @@ -159,18 +165,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -271,25 +266,38 @@ static int Open( vlc_object_t *p_this ) connect: /* Connect */ - if( Connect( p_access, 0 ) ) + switch( Connect( p_access, 0 ) ) { - /* Retry with http 1.0 */ - p_sys->i_version = 0; - - if( p_access->b_die || - 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; + + 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_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 and password.", &psz_login, &psz_password ); + 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", @@ -326,25 +334,20 @@ connect: goto error; } - p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) - { - msg_Err( p_access, "redirection failed: can't find playlist" ); - goto error; - } + /* Change the URI */ + p_playlist = pl_Yield( p_access ); + PL_LOCK; - /* Change the uri */ - vlc_mutex_lock( &p_playlist->object_lock ); - p_input_item = &p_playlist->status.p_item->input; + p_input_item = p_playlist->status.p_item->p_input; vlc_mutex_lock( &p_input_item->lock ); free( p_input_item->psz_uri ); 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 ); + + PL_UNLOCK; + pl_Release( p_access ); /* Clean up current Open() run */ vlc_UrlClean( &p_sys->url ); @@ -363,7 +366,7 @@ connect: 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; } @@ -404,7 +407,8 @@ connect: p_access->psz_demux = strdup( "nsv" ); } else if( p_sys->psz_mime && - !strcasecmp( p_sys->psz_mime, "application/xspf+xml" ) ) + !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" ); @@ -492,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 ); @@ -637,7 +642,8 @@ static int ReadICYMeta( access_t *p_access ) 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], ';' ); @@ -692,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 ) { @@ -732,18 +738,14 @@ 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(); + 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_SetTitle( p_meta, 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_SetGenre( p_meta, 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_SetNowPlaying( p_meta, p_sys->psz_icy_title ); break; case ACCESS_GET_TITLE_INFO: @@ -796,10 +798,10 @@ static int Connect( access_t *p_access, int64_t i_tell ) /* Open connection */ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port ); - if( p_sys->fd < 0 ) + 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 */ @@ -815,7 +817,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, @@ -829,7 +831,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 ); @@ -839,7 +841,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 @@ -849,7 +851,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' ) @@ -867,12 +869,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; } @@ -901,7 +903,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 = "/"; @@ -968,16 +970,15 @@ static int Request( access_t *p_access, int64_t i_tell ) 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 )