/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_interaction.h"
-#include "vlc_playlist.h"
-#include "vlc_meta.h"
-#include "network.h"
-#include "vlc_url.h"
-#include "vlc_tls.h"
+
+#include <vlc_access.h>
+
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_meta.h>
+#include <vlc_network.h>
+#include <vlc_url.h>
+#include <vlc_tls.h>
+#include <vlc_strings.h>
/*****************************************************************************
* Module descriptor
#define PROXY_TEXT N_("HTTP proxy")
#define PROXY_LONGTEXT N_( \
- "HTTP proxy to be usesd It must be of the form " \
+ "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." )
"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_("Read a file that is " \
- "being constantly updated (for example, a JPG file on a server)." \
+ "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." )
RECONNECT_LONGTEXT, VLC_TRUE );
add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
CONTINUOUS_LONGTEXT, VLC_TRUE );
- add_suppressed_string("http-user");
- add_suppressed_string("http-pwd");
+ add_obsolete_string("http-user");
+ add_obsolete_string("http-pwd");
add_shortcut( "http" );
add_shortcut( "https" );
add_shortcut( "unsv" );
+ add_shortcut( "itpc" ); /* iTunes Podcast */
set_callbacks( Open, Close );
vlc_module_end();
/* */
int i_code;
- char *psz_protocol;
+ const char *psz_protocol;
int i_version;
char *psz_mime;
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;
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 )
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."),
+ _("Please enter a valid login name and a password."),
&psz_login, &psz_password );
if( i_ret == DIALOG_OK_YES )
{
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;
- vlc_mutex_lock( &p_input_item->lock );
- free( p_input_item->psz_uri );
+ p_input_item = p_playlist->status.p_item->p_input;
+ input_item_SetURI( p_input_item, p_sys->psz_location );
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 );
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 );
+ 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 );
/* 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 &&
- !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" );
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 );
+ 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 );
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 );
+ free( p_sys->psz_mime );
+ free( p_sys->psz_pragma );
+ free( p_sys->psz_location );
- 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 );
+ free( p_sys->psz_icy_name );
+ free( p_sys->psz_icy_genre );
+ 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 );
/* 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 );
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], ';' );
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 )
{
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_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_TITLE_INFO:
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;
/* 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 */
{
/* 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,
{
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 );
{
msg_Err( p_access, "HTTP/TLS tunnel through proxy denied" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
do
{
msg_Err( p_access, "HTTP proxy connection failed" );
Disconnect( p_access );
- return VLC_EGENERIC;
+ return -1;
}
if( *psz == '\0' )
{
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;
}
}
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 = "/";
}
/* Authentication */
- if( p_sys->url.psz_username && *p_sys->url.psz_username )
+ 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->url.psz_username,
- p_sys->url.psz_password ? p_sys->url.psz_password : "" );
-
+ snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "",
+ p_sys->url.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,
+ "Authorization: Basic %s\r\n", b64 );
+ free( b64 );
+ }
}
/* Proxy Authentication */
- if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username )
+ if( p_sys->proxy.psz_username || p_sys->proxy.psz_password )
{
- char *buf;
+ char buf[strlen( p_sys->proxy.psz_username ?: "" )
+ + strlen( p_sys->proxy.psz_password ?: "" )];
char *b64;
- asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
- p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" );
-
+ 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,
- "Proxy-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 )
{
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->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
}
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" ) )
{
net_Close(p_sys->fd);
p_sys->fd = -1;
}
-
+
}
projects / vlc / blobdiff