/*****************************************************************************
* http.c: HTTP input module
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2005 VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#include "vlc_playlist.h"
#include "vlc_meta.h"
#include "network.h"
+#include "vlc_tls.h"
/*****************************************************************************
* Module descriptor
vlc_module_begin();
set_description( _("HTTP input") );
set_capability( "access2", 0 );
- set_name( _( "HTTP/HTTPS" ) );
+ set_shortname( _( "HTTP/HTTPS" ) );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_shortcut( "http" );
add_shortcut( "http4" );
add_shortcut( "http6" );
+ add_shortcut( "https" );
add_shortcut( "unsv" );
set_callbacks( Open, Close );
vlc_module_end();
struct access_sys_t
{
int fd;
+ tls_session_t *p_tls;
+ v_socket_t *p_vs;
/* From uri */
vlc_url_t url;
char *psz_location;
vlc_bool_t b_mms;
vlc_bool_t b_icecast;
+ vlc_bool_t b_ssl;
vlc_bool_t b_chunked;
int64_t i_chunk;
static void ParseURL( access_sys_t *, char *psz_url );
static int Connect( access_t *, int64_t );
static int Request( access_t *p_access, int64_t i_tell );
+static void Disconnect( access_t * );
/*****************************************************************************
* Open:
p_sys->psz_location = NULL;
p_sys->psz_user_agent = NULL;
p_sys->b_pace_control = VLC_TRUE;
+ p_sys->b_ssl = VLC_FALSE;
+ 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->i_remaining = 0;
/* Parse URI */
- ParseURL( p_sys, p_access->psz_path );
+ 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 );
+
if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
{
msg_Warn( p_access, "invalid host" );
goto error;
}
- if( p_sys->url.i_port <= 0 )
+ if( !strncmp( p_access->psz_access, "https", 5 ) )
{
- p_sys->url.i_port = 80;
+ /* SSL over HTTP */
+ 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;
}
if( !p_sys->psz_user || *p_sys->psz_user == '\0' )
{
p_sys->b_proxy = VLC_TRUE;
vlc_UrlParse( &p_sys->proxy, psz, 0 );
}
+#ifdef HAVE_GETENV
else
{
- char *psz_proxy = getenv( "http_proxy" );
+ 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 );
}
- if( psz_proxy )
- free( psz_proxy );
}
+#endif
free( psz );
if( p_sys->b_proxy )
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 );
msg_Err( p_access, "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,
- p_playlist->i_index + 1 );
+
+ /* 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 );
+ 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 );
- p_access->info.i_size = 0; /* Force to stop reading */
+ /* 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 );
+
+ Disconnect( p_access );
+ free( p_sys );
+
+ /* Do new Open() run with new data */
+ return Open( p_this );
}
if( p_sys->b_mms )
goto error;
}
- if( p_sys->b_icecast )
+ if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast )
{
- if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
- p_access->psz_demux = strdup( "mp3" );
+ if( p_sys->psz_mime && strcasecmp( p_sys->psz_mime, "application/ogg" ) )
+ {
+ 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
+ }
+ else if( !p_sys->psz_mime )
+ {
+ /* Shoutcast */
+ p_access->psz_demux = strdup( "mp3" );
+ }
+ /* else probably Ogg Vorbis */
}
-
- if( !strcmp( p_sys->psz_protocol, "ICY" ) )
+ else if( !strcasecmp( p_access->psz_access, "unsv" ) &&
+ p_sys->psz_mime &&
+ !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
{
- if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "video/nsv" ) )
- p_access->psz_demux = strdup( "nsv" );
- else if( p_sys->psz_mime &&
- ( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
- !strcasecmp( p_sys->psz_mime, "audio/aacp" ) ) )
- p_access->psz_demux = strdup( "m4a" );
- else
- p_access->psz_demux = strdup( "mp3" );
-
- msg_Info( p_access, "ICY 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
+ /* Grrrr! detect ultravox server and force NSV demuxer */
+ p_access->psz_demux = strdup( "nsv" );
}
if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
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 )
- {
- net_Close( p_sys->fd );
- }
+ Disconnect( p_access );
free( p_sys );
return VLC_EGENERIC;
}
if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent );
- if( p_sys->fd > 0 )
- {
- net_Close( p_sys->fd );
- }
+ Disconnect( p_access );
free( p_sys );
}
if( p_sys->i_chunk <= 0 )
{
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+ char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs );
/* read the chunk header */
if( psz == NULL )
{
i_len = i_next;
}
- i_read = net_Read( p_access, p_sys->fd, NULL, p_buffer, i_len, VLC_FALSE );
+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, VLC_FALSE );
if( i_read > 0 )
{
if( p_sys->i_chunk <= 0 )
{
/* read the empty line */
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+ char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs );
if( psz ) free( psz );
}
}
}
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 );
i_read = Read( p_access, p_buffer, i_len );
p_sys->b_continuous = VLC_TRUE;
}
+ Disconnect( p_access );
if( p_sys->b_reconnect )
{
msg_Dbg( p_access, "got disconnected, trying to reconnect" );
- net_Close( p_sys->fd ); p_sys->fd = -1;
if( Connect( p_access, p_access->info.i_pos ) )
{
msg_Dbg( p_access, "reconnection failed" );
char *p;
/* Read meta data length */
- i_read = net_Read( p_access, p_sys->fd, NULL, buffer, 1, VLC_TRUE );
+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, buffer, 1,
+ VLC_TRUE );
if( i_read <= 0 )
return VLC_EGENERIC;
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, NULL,
+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs,
psz_meta, buffer[0] * 16, VLC_TRUE );
if( i_read != buffer[0] * 16 )
return VLC_EGENERIC;
- psz_meta[buffer[0]*16 + 1] = '\0'; /* Just in case */
+ psz_meta[buffer[0]*16] = '\0'; /* Just in case */
- msg_Warn( p_access, "icy-meta=%s", psz_meta );
+ msg_Dbg( p_access, "icy-meta=%s", psz_meta );
/* Now parse the meta */
/* Look for StreamTitle= */
free( psz_meta );
- msg_Warn( p_access, "New Title=%s", p_sys->psz_icy_title );
+ msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
return VLC_SUCCESS;
}
*****************************************************************************/
static int Seek( access_t *p_access, int64_t i_pos )
{
- access_sys_t *p_sys = p_access->p_sys;
-
msg_Dbg( p_access, "trying to seek to "I64Fd, i_pos );
- net_Close( p_sys->fd ); p_sys->fd = -1;
+ Disconnect( p_access );
if( Connect( p_access, i_pos ) )
{
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;
/* */
msg_Dbg( p_access, "GET META %s %s %s",
p_sys->psz_icy_name, p_sys->psz_icy_genre, p_sys->psz_icy_title );
if( p_sys->psz_icy_name )
- vlc_meta_Add( *pp_meta, VLC_META_DESCRIPTION,
+ vlc_meta_Add( *pp_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 );
if( p_sys->psz_icy_title )
- vlc_meta_Add( *pp_meta, VLC_META_TITLE,
+ vlc_meta_Add( *pp_meta, VLC_META_NOW_PLAYING,
p_sys->psz_icy_title );
break;
{
access_sys_t *p_sys = p_access->p_sys;
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 );
return VLC_EGENERIC;
}
- return Request( p_access,i_tell );
+ /* Initialize TLS/SSL session */
+ if( p_sys->b_ssl == VLC_TRUE )
+ {
+ /* 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 VLC_EGENERIC;
+ }
+
+ 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 VLC_EGENERIC;
+ }
+
+ 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 VLC_EGENERIC;
+ }
+
+ 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 VLC_EGENERIC;
+ }
+
+ if( *psz == '\0' )
+ i_status = 0;
+
+ free( psz );
+ }
+ 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 VLC_EGENERIC;
+ }
+ p_sys->p_vs = &p_sys->p_tls->sock;
+ }
+
+ return Request( p_access, i_tell );
}
static int Request( access_t *p_access, int64_t i_tell )
{
access_sys_t *p_sys = p_access->p_sys;
- char *psz;
+ char *psz ;
+ v_socket_t *pvs = p_sys->p_vs;
+
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,
}
if( p_sys->url.i_port != 80)
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ 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
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ 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 );
}
}
/* User Agent */
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, "User-Agent: %s\r\n",
+ 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 )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
"Range: bytes="I64Fd"-\r\n", i_tell );
}
p_sys->psz_passwd ? p_sys->psz_passwd : "" );
b64 = vlc_b64_encode( buf );
+ free( buf );
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
"Authorization: Basic %s\r\n", b64 );
free( b64 );
}
/* ICY meta data request */
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, "Icy-MetaData: 1\r\n" );
+ 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 )
{
- net_Printf( VLC_OBJECT( p_access ), p_sys->fd, NULL,
+ net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
"Connection: keep-alive\r\n" );
}
else
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ 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, NULL, "\r\n" ) < 0 )
+ if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
{
msg_Err( p_access, "failed to send request" );
- net_Close( p_sys->fd ); p_sys->fd = -1;
+ Disconnect( p_access );
return VLC_EGENERIC;
}
/* Read Answer */
- if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ) ) == NULL )
+ if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ) ) == NULL )
{
msg_Err( p_access, "failed to read answer" );
goto error;
for( ;; )
{
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+ char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs );
char *p;
if( psz == NULL )
!strncasecmp( p, "Nanocaster", 10 ) )
{
/* Remember if this is Icecast
- * we need to force mp3 in some cases without breaking
+ * we need to force demux in this case without breaking
* autodetection */
- /* Let live 65 streams (nanocaster) piggyback on the icecast
+ /* Let live 365 streams (nanocaster) piggyback on the icecast
* routine. They look very similar */
p_sys->b_reconnect = VLC_TRUE;
if( p_sys->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 );
+
+ 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_SUCCESS;
error:
- net_Close( p_sys->fd ); p_sys->fd = -1;
+ Disconnect( p_access );
return VLC_EGENERIC;
}
+/*****************************************************************************
+ * Disconnect:
+ *****************************************************************************/
+static void Disconnect( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+
+ 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;
+ }
+
+}
projects / vlc / blobdiff