/*****************************************************************************
* http.c: HTTP input module
*****************************************************************************
- * Copyright (C) 2001-2005 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#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"
/*****************************************************************************
#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." )
+ "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_("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_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, VLC_FALSE );
+ AGENT_LONGTEXT, VLC_TRUE );
add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
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_shortcut( "http" );
- add_shortcut( "http4" );
- add_shortcut( "http6" );
add_shortcut( "https" );
add_shortcut( "unsv" );
set_callbacks( Open, Close );
{
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_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;
- }
- vlc_UrlParse( &p_sys->url, psz, 0 );
- free( psz );
- }
- else
- vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
+ /* 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' )
{
#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;
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 ) )
{
}
}
+ 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;
+ }
+ }
+
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 )
msg_Dbg( p_access, "redirection to %s", p_sys->psz_location );
+ /* 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, "insecure redirection ignored" );
+ goto error;
+ }
+
p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( !p_playlist )
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;
}
/* Grrrr! detect ultravox server and force NSV demuxer */
p_access->psz_demux = strdup( "nsv" );
}
+ else if( p_sys->psz_mime &&
+ !strcasecmp( p_sys->psz_mime, "application/xspf+xml" ) )
+ p_access->psz_demux = strdup( "xspf-open" );
if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
{
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);
+ i_read = buffer << 4;
+ /* msg_Dbg( p_access, "ICY meta size=%u", i_read); */
- 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 );
-
- 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( 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;
}
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 );
+
if( p_sys->psz_icy_name )
vlc_meta_Add( *pp_meta, VLC_META_TITLE,
p_sys->psz_icy_name );
/* Open connection */
- p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port );
+ p_sys->fd = net_ConnectTCP( p_access, srv.psz_host, srv.i_port );
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", srv.psz_host, srv.i_port );
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,
{
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 );
projects / vlc / blobdiff