/*****************************************************************************
* http.c: HTTP input module
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2008 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
+ * Rémi Denis-Courmont <rem # videolan.org>
+ * Antoine Cellerier <dionoea at videolan dot org>
*
* 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
*
* 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 <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+
+#include <vlc_dialog.h>
+#include <vlc_meta.h>
+#include <vlc_network.h>
+#include <vlc_url.h>
+#include <vlc_tls.h>
+#include <vlc_strings.h>
+#include <vlc_charset.h>
+#include <vlc_input.h>
+#include <vlc_md5.h>
+#include <vlc_http.h>
+
+#ifdef HAVE_ZLIB_H
+# include <zlib.h>
+#endif
-#include "vlc_playlist.h"
-#include "vlc_meta.h"
-#include "network.h"
-#include "vlc_tls.h"
+#include <assert.h>
+
+#ifdef HAVE_LIBPROXY
+# include <proxy.h>
+#endif
+
+#ifdef WIN32
+# include <windows.h>
+#endif
/*****************************************************************************
* Module descriptor
#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@]myproxy.mydomain:myport/ ; " \
+ "if empty, the http_proxy environment variable will be tried." )
+
+#define PROXY_PASS_TEXT N_("HTTP proxy password")
+#define PROXY_PASS_LONGTEXT N_( \
+ "If your HTTP proxy requires a password, set it here." )
#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." )
+
+#define FORWARD_COOKIES_TEXT N_("Forward Cookies")
+#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections.")
+
+#define MAX_REDIRECT_TEXT N_("Max number of redirection")
+#define MAX_REDIRECT_LONGTEXT N_("Limit the number of redirection to follow.")
-vlc_module_begin();
- set_description( _("HTTP input") );
- set_capability( "access2", 0 );
- set_shortname( _( "HTTP/HTTPS" ) );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
+#define USE_IE_PROXY_TEXT N_("Use Internet Explorer entered HTTP proxy server")
+#define USE_IE_PROXY_LONGTEXT N_("Use Internet Explorer entered HTTP proxy " \
+ "server for all URL. Don't take into account bypasses settings and auto " \
+ "configuration scripts.")
+
+vlc_module_begin ()
+ set_description( N_("HTTP input") )
+ set_capability( "access", 0 )
+ set_shortname( N_( "HTTP(S)" ) )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
- VLC_FALSE );
+ false )
+ add_password( "http-proxy-pwd", NULL, NULL,
+ PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
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 );
- add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, VLC_FALSE );
- 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_shortcut( "http" );
- add_shortcut( "http4" );
- add_shortcut( "http6" );
- add_shortcut( "https" );
- add_shortcut( "unsv" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ CACHING_TEXT, CACHING_LONGTEXT, true )
+ change_safe()
+ add_string( "http-user-agent", NULL, NULL,
+ AGENT_TEXT, AGENT_LONGTEXT, true )
+ change_safe()
+ change_need_restart()
+ add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,
+ RECONNECT_LONGTEXT, true )
+ add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT,
+ CONTINUOUS_LONGTEXT, true )
+ change_safe()
+ add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT,
+ FORWARD_COOKIES_LONGTEXT, true )
+ add_integer( "http-max-redirect", 5, NULL, MAX_REDIRECT_TEXT,
+ MAX_REDIRECT_LONGTEXT, true )
+#ifdef WIN32
+ add_bool( "http-use-IE-proxy", false, NULL, USE_IE_PROXY_TEXT,
+ USE_IE_PROXY_LONGTEXT, true )
+#endif
+ add_obsolete_string("http-user")
+ add_obsolete_string("http-pwd")
+ /* 'itpc' = iTunes Podcast */
+ add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
struct access_sys_t
{
int fd;
+ bool b_error;
tls_session_t *p_tls;
v_socket_t *p_vs;
/* From uri */
vlc_url_t url;
- char *psz_user;
- char *psz_passwd;
char *psz_user_agent;
+ http_auth_t auth;
/* Proxy */
- vlc_bool_t b_proxy;
+ bool b_proxy;
vlc_url_t proxy;
+ http_auth_t proxy_auth;
+ char *psz_proxy_passbuf;
/* */
int i_code;
- char *psz_protocol;
+ const char *psz_protocol;
int i_version;
char *psz_mime;
char *psz_pragma;
char *psz_location;
- vlc_bool_t b_mms;
- vlc_bool_t b_icecast;
- vlc_bool_t b_ssl;
+ bool b_mms;
+ bool b_icecast;
+ bool b_ssl;
+#ifdef HAVE_ZLIB_H
+ bool b_compressed;
+ struct
+ {
+ z_stream stream;
+ uint8_t *p_buffer;
+ } inflate;
+#endif
- vlc_bool_t b_chunked;
+ bool b_chunked;
int64_t i_chunk;
int i_icy_meta;
+ uint64_t i_icy_offset;
char *psz_icy_name;
char *psz_icy_genre;
char *psz_icy_title;
- int i_remaining;
+ uint64_t i_remaining;
- vlc_bool_t b_seekable;
- vlc_bool_t b_reconnect;
- vlc_bool_t b_continuous;
- vlc_bool_t b_pace_control;
+ bool b_seekable;
+ bool b_reconnect;
+ bool b_continuous;
+ bool b_pace_control;
+ bool b_persist;
+ bool b_has_size;
+
+ vlc_array_t * cookies;
};
/* */
-static int Read( access_t *, uint8_t *, int );
-static int Seek( access_t *, int64_t );
+static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
+ int i_nb_redirect, int i_max_redirect,
+ vlc_array_t *cookies );
+
+/* */
+static ssize_t Read( access_t *, uint8_t *, size_t );
+static ssize_t ReadCompressed( access_t *, uint8_t *, size_t );
+static int Seek( access_t *, uint64_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 Request( access_t *p_access, int64_t i_tell );
+static int Connect( access_t *, uint64_t );
+static int Request( access_t *p_access, uint64_t i_tell );
static void Disconnect( access_t * );
+/* Small Cookie utilities. Cookies support is partial. */
+static char * cookie_get_content( const char * cookie );
+static char * cookie_get_domain( const char * cookie );
+static char * cookie_get_name( const char * cookie );
+static void cookie_append( vlc_array_t * cookies, char * cookie );
+
+
+static void AuthReply( access_t *p_acces, const char *psz_prefix,
+ vlc_url_t *p_url, http_auth_t *p_auth );
+static int AuthCheckReply( access_t *p_access, const char *psz_header,
+ vlc_url_t *p_url, http_auth_t *p_auth );
+
/*****************************************************************************
* Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this )
+{
+ access_t *p_access = (access_t*)p_this;
+ return OpenWithCookies( p_this, p_access->psz_access, 0,
+ var_InheritInteger( p_access, "http-max-redirect" ), NULL );
+}
+
+/**
+ * Open the given url using the given cookies
+ * @param p_this: the vlc object
+ * @psz_access: the acces to use (http, https, ...) (this value must be used
+ * instead of p_access->psz_access)
+ * @i_nb_redirect: the number of redirection already done
+ * @i_max_redirect: limit to the number of redirection to follow
+ * @cookies: the available cookies
+ * @return vlc error codes
+ */
+static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
+ int i_nb_redirect, int i_max_redirect,
+ vlc_array_t *cookies )
{
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- char *psz;
+ char *psz, *p;
- /* 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 );
- }
- }
+ /* Only forward an store cookies if the corresponding option is activated */
+ bool b_forward_cookies = var_InheritBool( p_access, "http-forward-cookies" );
+ vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ? cookies : vlc_array_new()) : NULL;
/* 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;
+#ifdef HAVE_ZLIB_H
+ p_access->pf_read = ReadCompressed;
+#endif
p_sys->fd = -1;
- p_sys->b_proxy = VLC_FALSE;
+ p_sys->b_proxy = false;
+ p_sys->psz_proxy_passbuf = NULL;
p_sys->i_version = 1;
- p_sys->b_seekable = VLC_TRUE;
+ p_sys->b_seekable = true;
p_sys->psz_mime = NULL;
p_sys->psz_pragma = NULL;
- p_sys->b_mms = VLC_FALSE;
- p_sys->b_icecast = VLC_FALSE;
+ p_sys->b_mms = false;
+ p_sys->b_icecast = false;
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->b_pace_control = true;
+ p_sys->b_ssl = false;
+#ifdef HAVE_ZLIB_H
+ p_sys->b_compressed = false;
+ /* 15 is the max windowBits, +32 to enable optional gzip decoding */
+ if( inflateInit2( &p_sys->inflate.stream, 32+15 ) != Z_OK )
+ msg_Warn( p_access, "Error during zlib initialisation: %s",
+ p_sys->inflate.stream.msg );
+ if( zlibCompileFlags() & (1<<17) )
+ msg_Warn( p_access, "Your zlib was compiled without gzip support." );
+ p_sys->inflate.p_buffer = NULL;
+#endif
p_sys->p_tls = NULL;
p_sys->p_vs = NULL;
p_sys->i_icy_meta = 0;
+ p_sys->i_icy_offset = 0;
p_sys->psz_icy_name = NULL;
p_sys->psz_icy_genre = NULL;
p_sys->psz_icy_title = NULL;
p_sys->i_remaining = 0;
+ p_sys->b_persist = false;
+ p_sys->b_has_size = false;
+ p_access->info.i_size = 0;
+ p_access->info.i_pos = 0;
+ p_access->info.b_eof = false;
+
+ p_sys->cookies = saved_cookies;
+
+ http_auth_Init( &p_sys->auth );
+ http_auth_Init( &p_sys->proxy_auth );
+
+ /* Parse URI - remove spaces */
+ p = psz = strdup( p_access->psz_location );
+ while( (p = strchr( p, ' ' )) != NULL )
+ *p = '+';
+ vlc_UrlParse( &p_sys->url, psz, 0 );
+ free( psz );
- /* Parse URI */
- 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( !strncmp( p_access->psz_access, "https", 5 ) )
+ if( !strncmp( psz_access, "https", 5 ) )
{
- /* SSL over HTTP */
- p_sys->b_ssl = VLC_TRUE;
+ /* HTTP over SSL */
+ p_sys->b_ssl = true;
if( p_sys->url.i_port <= 0 )
p_sys->url.i_port = 443;
}
if( p_sys->url.i_port <= 0 )
p_sys->url.i_port = 80;
}
- if( !p_sys->psz_user || *p_sys->psz_user == '\0' )
+
+ /* Determine the HTTP user agent */
+ /* See RFC2616 §2.2 token definition and §3.8 user-agent header */
+ p_sys->psz_user_agent = var_InheritString( p_access, "http-user-agent" );
+ for( char *p = p_sys->psz_user_agent; *p; p++ )
{
- p_sys->psz_user = var_CreateGetString( p_access, "http-user" );
- p_sys->psz_passwd = var_CreateGetString( p_access, "http-pwd" );
+ uint8_t c = *p;
+ if( c < 32 || strchr( "()<>@,;:\\\"[]?={}", c ) )
+ *p = '_'; /* remove potentially harmful characters */
}
- /* Do user agent */
- p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" );
-
/* Check proxy */
- psz = var_CreateGetString( p_access, "http-proxy" );
- if( *psz )
+ psz = var_InheritString( p_access, "http-proxy" );
+ if( psz )
{
- p_sys->b_proxy = VLC_TRUE;
+ p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz, 0 );
+ free( psz );
}
+#ifdef HAVE_LIBPROXY
else
{
- char *psz_proxy = getenv( "http_proxy" );
- if( psz_proxy && *psz_proxy )
+ pxProxyFactory *pf = px_proxy_factory_new();
+ if (pf)
{
- p_sys->b_proxy = VLC_TRUE;
- vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+ char *buf;
+ int i;
+ i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_location);
+ if (i >= 0)
+ {
+ msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
+ char **proxies = px_proxy_factory_get_proxies(pf, buf);
+ if (proxies[0])
+ {
+ msg_Dbg(p_access, "libproxy suggest to use '%s'", proxies[0]);
+ if(strcmp(proxies[0],"direct://") != 0)
+ {
+ p_sys->b_proxy = true;
+ vlc_UrlParse( &p_sys->proxy, proxies[0], 0);
+ }
+ }
+ for(i=0;proxies[i];i++) free(proxies[i]);
+ free(proxies);
+ free(buf);
+ }
+ px_proxy_factory_free(pf);
+ }
+ else
+ {
+ msg_Err(p_access, "Allocating memory for libproxy failed");
}
- if( psz_proxy )
- free( psz_proxy );
}
- free( psz );
+#elif defined( WIN32 )
+ else
+ {
+ if( var_InheritBool( p_access, "http-use-IE-proxy" ) )
+ {
+ /* Try to get the proxy server address from Windows internet settings using registry. */
+ HKEY h_key;
+ /* Open the key */
+ if( RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\Microsoft" \
+ "\\Windows\\CurrentVersion\\Internet Settings",
+ 0, KEY_READ, &h_key ) == ERROR_SUCCESS )
+ {
+ DWORD i_dataReadSize = 4; /* sizeof( DWORD ); */
+ DWORD proxyEnable = 0;
+ /* Get the proxy enable value */
+ if( RegQueryValueEx( h_key, "ProxyEnable", NULL, NULL,
+ (char *)&proxyEnable, &i_dataReadSize )
+ == ERROR_SUCCESS )
+ {
+ if( proxyEnable )
+ {
+ /* Proxy is enable */
+ char psz_key[256];
+ i_dataReadSize = 256;
+ if( RegQueryValueEx( h_key, "ProxyServer",
+ NULL, NULL, psz_key,
+ &i_dataReadSize )
+ == ERROR_SUCCESS )
+ {
+ /* Get the proxy URL :
+ Proxy server value in the registry can be something like "address:port"
+ or "ftp=address1:port1;http=address2:port2 ..." depending of the
+ confirguration. */
+ char *psz_proxy;
+ psz_proxy = strstr( psz_key, "http=" );
+ if( psz_proxy != NULL )
+ {
+ psz_proxy += strlen( "http=" );
+ char *psz_endUrl = strchr( psz_proxy, ';' );
+ if( psz_endUrl != NULL )
+ *psz_endUrl = '\0';
+ }
+ else
+ psz_proxy = psz_key;
+ /* Set proxy enable for this connection. */
+ p_sys->b_proxy = true;
+ vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+ }
+ msg_Warn( p_access, "Couldn't read in registry " \
+ "the proxy server address." );
+ }
+ }
+ else
+ msg_Warn( p_access, "Couldn't read in registry if the " \
+ "proxy is enable or not." );
+ }
+ else
+ msg_Warn( p_access, "Couldn't open internet settings key " \
+ "in registry." );
+ }
+ }
+#elif defined( HAVE_GETENV )
+ else
+ {
+ psz = getenv( "http_proxy" );
+ if( psz )
+ {
+ p_sys->b_proxy = true;
+ vlc_UrlParse( &p_sys->proxy, psz, 0 );
+ }
+ }
+#endif
+
+ if( psz ) /* No, this is NOT a use-after-free error */
+ {
+ psz = var_InheritString( p_access, "http-proxy-pwd" );
+ if( psz )
+ p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
+ }
if( p_sys->b_proxy )
{
}
}
- msg_Dbg( p_access, "http: server='%s' port=%d file='%s",
- p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path );
+ msg_Dbg( p_access, "http: server='%s' port=%d file='%s'",
+ p_sys->url.psz_host, p_sys->url.i_port,
+ p_sys->url.psz_path != NULL ? p_sys->url.psz_path : "" );
if( p_sys->b_proxy )
{
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 );
+ msg_Dbg( p_access, " user='%s'", p_sys->url.psz_username );
}
- p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" );
- p_sys->b_continuous = var_CreateGetBool( p_access, "http-continuous" );
+ p_sys->b_reconnect = var_InheritBool( p_access, "http-reconnect" );
+ p_sys->b_continuous = var_InheritBool( 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;
- if( p_access->b_die ||
- Connect( p_access, 0 ) )
+ 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 = false;
+
+ if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) )
+ goto error;
+
+#ifndef NDEBUG
+ case 0:
+ break;
+
+ default:
+ msg_Err( p_access, "You should not be here" );
+ abort();
+#endif
+ }
+
+ if( p_sys->i_code == 401 )
+ {
+ char *psz_login, *psz_password;
+ /* FIXME ? */
+ if( p_sys->url.psz_username && p_sys->url.psz_password &&
+ p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 )
{
+ Disconnect( p_access );
+ goto connect;
+ }
+ msg_Dbg( p_access, "authentication failed for realm %s",
+ p_sys->auth.psz_realm );
+ dialog_Login( p_access, &psz_login, &psz_password,
+ _("HTTP authentication"),
+ _("Please enter a valid login name and a password for realm %s."),
+ p_sys->auth.psz_realm );
+ if( psz_login != NULL && psz_password != NULL )
+ {
+ msg_Dbg( p_access, "retrying with user=%s", psz_login );
+ p_sys->url.psz_username = psz_login;
+ p_sys->url.psz_password = psz_password;
+ Disconnect( p_access );
+ goto connect;
+ }
+ else
+ {
+ free( psz_login );
+ free( psz_password );
goto error;
}
}
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 )
+ /* Check the number of redirection already done */
+ if( i_nb_redirect >= i_max_redirect )
{
- msg_Err( p_access, "redirection failed: can't find playlist" );
+ msg_Err( p_access, "Too many redirection: break potential infinite"
+ "loop" );
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 );
- 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 );
+ /* Do not accept redirection outside of HTTP works */
+ const char *psz_protocol;
+ if( !strncmp( p_sys->psz_location, "http:", 5 ) )
+ psz_protocol = "http";
+ else if( !strncmp( p_sys->psz_location, "https:", 6 ) )
+ psz_protocol = "https";
+ else
+ {
+ msg_Err( p_access, "insecure redirection ignored" );
+ goto error;
+ }
+ free( p_access->psz_location );
+ p_access->psz_location = strdup( p_sys->psz_location );
/* Clean up current Open() run */
vlc_UrlClean( &p_sys->url );
+ http_auth_Reset( &p_sys->auth );
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_proxy_passbuf );
+ http_auth_Reset( &p_sys->proxy_auth );
+ free( p_sys->psz_mime );
+ free( p_sys->psz_pragma );
+ free( p_sys->psz_location );
+ free( p_sys->psz_user_agent );
Disconnect( p_access );
+ cookies = p_sys->cookies;
+#ifdef HAVE_ZLIB_H
+ inflateEnd( &p_sys->inflate.stream );
+#endif
free( p_sys );
/* Do new Open() run with new data */
- return Open( p_this );
+ return OpenWithCookies( p_this, psz_protocol, i_nb_redirect + 1,
+ i_max_redirect, cookies );
}
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;
}
if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast )
{
- 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 if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
- p_access->psz_demux = strdup( "mp3" );
- else /* assume mp3, though this is definetly not certain */
- 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" ) )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "nsv" );
+ }
+ else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
+ !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "m4a" );
+ }
+ else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "mp3" );
+ }
- msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
- p_access->psz_demux );
+ 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;
+#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 = false;
#endif
+ }
+ else if( !p_sys->psz_mime )
+ {
+ free( p_access->psz_demux );
+ /* Shoutcast */
+ p_access->psz_demux = strdup( "mp3" );
+ }
+ /* else probably Ogg Vorbis */
+ }
+ else if( !strcasecmp( psz_access, "unsv" ) &&
+ p_sys->psz_mime &&
+ !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
+ {
+ free( p_access->psz_demux );
+ /* Grrrr! detect ultravox server and force NSV demuxer */
+ p_access->psz_demux = strdup( "nsv" );
+ }
+ else if( !strcmp( psz_access, "itpc" ) )
+ {
+ free( p_access->psz_demux );
+ 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 ) )
+ {
+ free( p_access->psz_demux );
+ 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 );
- if( p_sys->psz_user ) free( p_sys->psz_user );
- if( p_sys->psz_passwd ) free( p_sys->psz_passwd );
+ free( p_sys->psz_proxy_passbuf );
+ free( p_sys->psz_mime );
+ free( p_sys->psz_pragma );
+ free( p_sys->psz_location );
+ free( p_sys->psz_user_agent );
Disconnect( p_access );
+
+ if( p_sys->cookies )
+ {
+ int i;
+ for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ )
+ free(vlc_array_item_at_index( p_sys->cookies, i ));
+ vlc_array_destroy( p_sys->cookies );
+ }
+
+#ifdef HAVE_ZLIB_H
+ inflateEnd( &p_sys->inflate.stream );
+#endif
free( p_sys );
return VLC_EGENERIC;
}
access_sys_t *p_sys = p_access->p_sys;
vlc_UrlClean( &p_sys->url );
+ http_auth_Reset( &p_sys->auth );
vlc_UrlClean( &p_sys->proxy );
+ http_auth_Reset( &p_sys->proxy_auth );
- if( p_sys->psz_user ) free( p_sys->psz_user );
- if( p_sys->psz_passwd ) free( p_sys->psz_passwd );
-
- 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 );
+
+ if( p_sys->cookies )
+ {
+ int i;
+ for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ )
+ free(vlc_array_item_at_index( p_sys->cookies, i ));
+ vlc_array_destroy( p_sys->cookies );
+ }
+
+#ifdef HAVE_ZLIB_H
+ inflateEnd( &p_sys->inflate.stream );
+ free( p_sys->inflate.p_buffer );
+#endif
+
free( p_sys );
}
* 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;
- if( p_sys->fd < 0 )
+ if( p_sys->fd == -1 )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
- if( p_access->info.i_size > 0 &&
- i_len + p_access->info.i_pos > p_access->info.i_size )
+ if( p_sys->b_has_size )
{
- if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 )
- {
- p_access->info.b_eof = VLC_TRUE;
- return 0;
- }
+ /* Remaining bytes in the file */
+ uint64_t remainder = p_access->info.i_size - p_access->info.i_pos;
+ if( remainder < i_len )
+ i_len = remainder;
+
+ /* Remaining bytes in the response */
+ if( p_sys->i_remaining < i_len )
+ i_len = p_sys->i_remaining;
}
if( p_sys->b_chunked )
{
if( p_sys->i_chunk < 0 )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
if( p_sys->i_chunk <= 0 )
{
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs );
+ char *psz = net_Gets( p_access, p_sys->fd, p_sys->p_vs );
/* 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 );
if( p_sys->i_chunk <= 0 ) /* eof */
{
p_sys->i_chunk = -1;
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
}
if( i_len > p_sys->i_chunk )
- {
i_len = p_sys->i_chunk;
- }
}
- if( p_sys->b_continuous && i_len > p_sys->i_remaining )
+ if( i_len == 0 )
{
- /* Only ask for the remaining length */
- int i_new_len = p_sys->i_remaining;
- if( i_new_len == 0 )
- {
- Request( p_access, 0 );
- i_read = Read( p_access, p_buffer, i_len );
- return i_read;
- }
- i_len = i_new_len;
+ p_access->info.b_eof = true;
+ return 0;
}
- if( p_sys->i_icy_meta > 0 && p_access->info.i_pos > 0 )
+ if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 )
{
int64_t i_next = p_sys->i_icy_meta -
- p_access->info.i_pos % p_sys->i_icy_meta;
+ (p_access->info.i_pos - p_sys->i_icy_offset ) % p_sys->i_icy_meta;
if( i_next == p_sys->i_icy_meta )
{
if( ReadICYMeta( p_access ) )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return -1;
}
}
i_len = i_next;
}
- i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, VLC_FALSE );
+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, p_buffer, i_len, false );
if( i_read > 0 )
{
- p_access->info.i_pos += i_read;
-
if( p_sys->b_chunked )
{
p_sys->i_chunk -= i_read;
if( p_sys->i_chunk <= 0 )
{
/* read the empty line */
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs );
- if( psz ) free( psz );
+ char *psz = net_Gets( p_access, p_sys->fd, p_sys->p_vs );
+ free( psz );
}
}
}
- else if( i_read == 0 )
+ else
{
+ /*
+ * 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 );
- p_sys->b_continuous = VLC_FALSE;
+ p_sys->b_continuous = false;
i_read = Read( p_access, p_buffer, i_len );
- p_sys->b_continuous = VLC_TRUE;
+ p_sys->b_continuous = true;
}
- if( p_sys->b_reconnect )
+ Disconnect( p_access );
+ if( p_sys->b_reconnect && vlc_object_alive( p_access ) )
{
msg_Dbg( p_access, "got disconnected, trying to reconnect" );
- Disconnect( p_access );
if( Connect( p_access, p_access->info.i_pos ) )
{
msg_Dbg( p_access, "reconnection failed" );
}
else
{
- p_sys->b_reconnect = VLC_FALSE;
+ p_sys->b_reconnect = false;
i_read = Read( p_access, p_buffer, i_len );
- p_sys->b_reconnect = VLC_TRUE;
+ p_sys->b_reconnect = true;
+
+ return i_read;
}
}
- if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE;
+ if( i_read <= 0 )
+ {
+ p_access->info.b_eof = true;
+ if( i_read < 0 )
+ p_sys->b_error = true;
+ return 0;
+ }
}
- if( p_sys->b_continuous )
+ assert( i_read >= 0 );
+ p_access->info.i_pos += i_read;
+ if( p_sys->b_has_size )
{
+ assert( p_access->info.i_pos <= p_access->info.i_size );
+ assert( (unsigned)i_read <= p_sys->i_remaining );
p_sys->i_remaining -= i_read;
}
{
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,
- VLC_TRUE );
+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1,
+ 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, true ) != i_read )
+ {
+ free( psz_meta );
return VLC_EGENERIC;
+ }
- psz_meta[buffer[0]*16 + 1] = '\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], ';' );
if( psz ) *psz = '\0';
}
- if( p_sys->psz_icy_title ) free( p_sys->psz_icy_title );
+ if( !p_sys->psz_icy_title ||
+ strcmp( p_sys->psz_icy_title, &p[1] ) )
+ {
+ free( p_sys->psz_icy_title );
+ char *psz_tmp = strdup( &p[1] );
+ p_sys->psz_icy_title = EnsureUTF8( psz_tmp );
+ if( !p_sys->psz_icy_title )
+ free( psz_tmp );
+ p_access->info.i_update |= INPUT_UPDATE_META;
+
+ msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
+ }
+ }
+ free( psz_meta );
+
+ return VLC_SUCCESS;
+}
- p_sys->psz_icy_title = strdup( &p[1] );
+#ifdef HAVE_ZLIB_H
+static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer,
+ size_t i_len )
+{
+ access_sys_t *p_sys = p_access->p_sys;
- p_access->info.i_update |= INPUT_UPDATE_META;
- }
+ if( p_sys->b_compressed )
+ {
+ int i_ret;
- free( psz_meta );
+ if( !p_sys->inflate.p_buffer )
+ p_sys->inflate.p_buffer = malloc( 256 * 1024 );
- msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
+ if( p_sys->inflate.stream.avail_in == 0 )
+ {
+ ssize_t i_read = Read( p_access, p_sys->inflate.p_buffer + p_sys->inflate.stream.avail_in, 256 * 1024 );
+ if( i_read <= 0 ) return i_read;
+ p_sys->inflate.stream.next_in = p_sys->inflate.p_buffer;
+ p_sys->inflate.stream.avail_in = i_read;
+ }
- return VLC_SUCCESS;
+ p_sys->inflate.stream.avail_out = i_len;
+ p_sys->inflate.stream.next_out = p_buffer;
+
+ i_ret = inflate( &p_sys->inflate.stream, Z_SYNC_FLUSH );
+ msg_Warn( p_access, "inflate return value: %d, %s", i_ret, p_sys->inflate.stream.msg );
+
+ return i_len - p_sys->inflate.stream.avail_out;
+ }
+ else
+ {
+ return Read( p_access, p_buffer, i_len );
+ }
}
+#endif
/*****************************************************************************
* Seek: close and re-open a connection at the right place
*****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
{
- msg_Dbg( p_access, "trying to seek to "I64Fd, i_pos );
+ msg_Dbg( p_access, "trying to seek to %"PRId64, i_pos );
Disconnect( p_access );
+ if( p_access->info.i_size
+ && i_pos >= p_access->info.i_size ) {
+ msg_Err( p_access, "seek to far" );
+ int retval = Seek( p_access, p_access->info.i_size - 1 );
+ if( retval == VLC_SUCCESS ) {
+ uint8_t p_buffer[2];
+ Read( p_access, p_buffer, 1);
+ p_access->info.b_eof = false;
+ }
+ return retval;
+ }
if( Connect( p_access, i_pos ) )
{
msg_Err( p_access, "seek failed" );
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return VLC_EGENERIC;
}
return VLC_SUCCESS;
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
- vlc_meta_t **pp_meta;
+ bool *pb_bool;
+ int64_t *pi_64;
+ vlc_meta_t *p_meta;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_seekable;
break;
case ACCESS_CAN_FASTSEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
break;
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
+
+#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 = true;
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
- break;
-
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000;
break;
/* */
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_DESCRIPTION,
- 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_TITLE,
- 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:
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]@<hostname>[:<port>][/<path>] */
- 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:
*****************************************************************************/
-static int Connect( access_t *p_access, int64_t i_tell )
+static int Connect( access_t *p_access, uint64_t i_tell )
{
access_sys_t *p_sys = p_access->p_sys;
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;
p_sys->psz_mime = NULL;
p_sys->psz_pragma = NULL;
- p_sys->b_mms = VLC_FALSE;
- p_sys->b_chunked = VLC_FALSE;
+ p_sys->b_mms = false;
+ p_sys->b_chunked = false;
p_sys->i_chunk = 0;
p_sys->i_icy_meta = 0;
+ p_sys->i_icy_offset = i_tell;
p_sys->psz_icy_name = NULL;
p_sys->psz_icy_genre = NULL;
p_sys->psz_icy_title = NULL;
-
+ p_sys->i_remaining = 0;
+ p_sys->b_persist = false;
+ p_sys->b_has_size = false;
p_access->info.i_size = 0;
p_access->info.i_pos = i_tell;
- p_access->info.b_eof = VLC_FALSE;
-
+ p_access->info.b_eof = false;
/* Open connection */
- p_sys->fd = net_OpenTCP( p_access, srv.psz_host, srv.i_port );
- if( p_sys->fd < 0 )
+ assert( p_sys->fd == -1 ); /* No open sockets (leaking fds is BAD) */
+ 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;
}
+ setsockopt (p_sys->fd, SOL_SOCKET, SO_KEEPALIVE, &(int){ 1 }, sizeof (int));
/* Initialize TLS/SSL session */
- /* FIXME: support proxy CONNECT for HTTP/SSL */
- if( p_sys->b_ssl == VLC_TRUE )
+ if( p_sys->b_ssl == true )
{
+ /* CONNECT to establish TLS tunnel through HTTP proxy */
if( p_sys->b_proxy )
{
- msg_Err( p_access, "HTTP/SSL through HTTP proxy not supported yet" );
- Disconnect( p_access );
- return VLC_EGENERIC;
+ char *psz;
+ unsigned i_status = 0;
+
+ if( p_sys->i_version == 0 )
+ {
+ /* CONNECT is not in HTTP/1.0 */
+ Disconnect( p_access );
+ return -1;
+ }
+
+ net_Printf( 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( p_access, p_sys->fd, NULL );
+ if( psz == NULL )
+ {
+ msg_Err( p_access, "cannot establish HTTP/TLS tunnel" );
+ Disconnect( p_access );
+ return -1;
+ }
+
+ 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 -1;
+ }
+
+ do
+ {
+ psz = net_Gets( p_access, p_sys->fd, NULL );
+ if( psz == NULL )
+ {
+ msg_Err( p_access, "HTTP proxy connection failed" );
+ Disconnect( p_access );
+ return -1;
+ }
+
+ if( *psz == '\0' )
+ i_status = 0;
+
+ free( psz );
+
+ if( !vlc_object_alive (p_access) || p_sys->b_error )
+ {
+ Disconnect( p_access );
+ return -1;
+ }
+ }
+ while( i_status );
}
- p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), NULL, p_sys->fd );
+ /* TLS/SSL handshake */
+ p_sys->p_tls = tls_ClientCreate( VLC_OBJECT(p_access), p_sys->fd,
+ p_sys->url.psz_host );
if( p_sys->p_tls == NULL )
{
- msg_Err( p_access, "cannot establish HTTP/SSL session" );
+ 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;
}
-static int Request( access_t *p_access, int64_t i_tell )
+static int Request( access_t *p_access, uint64_t i_tell )
{
access_sys_t *p_sys = p_access->p_sys;
char *psz ;
v_socket_t *pvs = p_sys->p_vs;
+ p_sys->b_persist = false;
+ p_sys->i_remaining = 0;
if( p_sys->b_proxy )
{
if( p_sys->url.psz_path )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ net_Printf( p_access, p_sys->fd, NULL,
"GET http://%s:%d%s HTTP/1.%d\r\n",
p_sys->url.psz_host, p_sys->url.i_port,
p_sys->url.psz_path, p_sys->i_version );
}
else
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ net_Printf( p_access, p_sys->fd, NULL,
"GET http://%s:%d/ HTTP/1.%d\r\n",
p_sys->url.psz_host, p_sys->url.i_port,
p_sys->i_version );
}
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 = "/";
}
- if( p_sys->url.i_port != 80)
+ if( p_sys->url.i_port != (pvs ? 443 : 80) )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ net_Printf( 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, pvs,
+ net_Printf( 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, pvs, "User-Agent: %s\r\n",
+ net_Printf( p_access, p_sys->fd, pvs,
+ "User-Agent: %s\r\n",
p_sys->psz_user_agent );
/* Offset */
- if( p_sys->i_version == 1 )
+ if( p_sys->i_version == 1 && ! p_sys->b_continuous )
{
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
- "Range: bytes="I64Fd"-\r\n", i_tell );
+ p_sys->b_persist = true;
+ net_Printf( p_access, p_sys->fd, pvs,
+ "Range: bytes=%"PRIu64"-\r\n", i_tell );
+ net_Printf( p_access, p_sys->fd, pvs, "Connection: close\r\n" );
}
- /* Authentification */
- if( p_sys->psz_user && *p_sys->psz_user )
+ /* Cookies */
+ if( p_sys->cookies )
{
- char *buf;
- char *b64;
+ int i;
+ for( i = 0; i < vlc_array_count( p_sys->cookies ); i++ )
+ {
+ const char * cookie = vlc_array_item_at_index( p_sys->cookies, i );
+ char * psz_cookie_content = cookie_get_content( cookie );
+ char * psz_cookie_domain = cookie_get_domain( cookie );
- asprintf( &buf, "%s:%s", p_sys->psz_user,
- p_sys->psz_passwd ? p_sys->psz_passwd : "" );
+ assert( psz_cookie_content );
- b64 = vlc_b64_encode( buf );
+ /* FIXME: This is clearly not conforming to the rfc */
+ bool is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain ));
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
- "Authorization: Basic %s\r\n", b64 );
- free( b64 );
+ if( is_in_right_domain )
+ {
+ msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content );
+ if( net_Printf( p_access, p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 )
+ msg_Err( p_access, "failed to send Cookie" );
+ }
+ free( psz_cookie_content );
+ free( psz_cookie_domain );
+ }
}
- /* ICY meta data request */
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
+ /* Authentication */
+ if( p_sys->url.psz_username || p_sys->url.psz_password )
+ AuthReply( p_access, "", &p_sys->url, &p_sys->auth );
+ /* Proxy Authentication */
+ if( p_sys->proxy.psz_username || p_sys->proxy.psz_password )
+ AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth );
+
+ /* ICY meta data request */
+ net_Printf( 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, pvs,
- "Connection: keep-alive\r\n" );
- }
- else
- {
- 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 )
+ if( net_Printf( p_access, p_sys->fd, pvs, "\r\n" ) < 0 )
{
msg_Err( p_access, "failed to send request" );
Disconnect( p_access );
}
/* Read Answer */
- if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs ) ) == NULL )
+ if( ( psz = net_Gets( p_access, p_sys->fd, pvs ) ) == NULL )
{
msg_Err( p_access, "failed to read answer" );
goto error;
{
p_sys->psz_protocol = "ICY";
p_sys->i_code = atoi( &psz[4] );
- p_sys->b_reconnect = VLC_TRUE;
+ p_sys->b_reconnect = true;
}
else
{
p_sys->psz_protocol, p_sys->i_code );
if( !strcmp( p_sys->psz_protocol, "ICY" ) )
{
- p_sys->b_seekable = VLC_FALSE;
+ p_sys->b_seekable = false;
+ }
+ if( p_sys->i_code != 206 && p_sys->i_code != 401 )
+ {
+ p_sys->b_seekable = false;
}
- if( p_sys->i_code != 206 )
+ /* Authentication error - We'll have to display the dialog */
+ if( p_sys->i_code == 401 )
{
- p_sys->b_seekable = VLC_FALSE;
+
}
- if( p_sys->i_code >= 400 )
+ /* Other fatal error */
+ else if( p_sys->i_code >= 400 )
{
msg_Err( p_access, "error: %s", psz );
free( psz );
for( ;; )
{
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, pvs );
+ char *psz = net_Gets( p_access, p_sys->fd, pvs );
char *p;
if( psz == NULL )
goto error;
}
+ if( !vlc_object_alive (p_access) || p_sys->b_error )
+ {
+ free( psz );
+ goto error;
+ }
+
/* msg_Dbg( p_input, "Line=%s", psz ); */
if( *psz == '\0' )
{
break;
}
-
if( ( p = strchr( psz, ':' ) ) == NULL )
{
msg_Err( p_access, "malformed header line: %s", psz );
if( !strcasecmp( psz, "Content-Length" ) )
{
- if( p_sys->b_continuous )
- {
- p_access->info.i_size = -1;
- msg_Dbg( p_access, "this frame size="I64Fd, atoll(p ) );
- p_sys->i_remaining = atoll( p );
+ uint64_t i_size = i_tell + (p_sys->i_remaining = (uint64_t)atoll( p ));
+ if(i_size > p_access->info.i_size) {
+ p_sys->b_has_size = true;
+ p_access->info.i_size = i_size;
}
- else
- {
- p_access->info.i_size = i_tell + atoll( p );
- msg_Dbg( p_access, "stream size="I64Fd, p_access->info.i_size );
+ msg_Dbg( p_access, "this frame size=%"PRIu64, p_sys->i_remaining );
+ }
+ else if( !strcasecmp( psz, "Content-Range" ) ) {
+ uint64_t i_ntell = i_tell;
+ uint64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell;
+ uint64_t i_nsize = p_access->info.i_size;
+ sscanf(p,"bytes %"SCNu64"-%"SCNu64"/%"SCNu64,&i_ntell,&i_nend,&i_nsize);
+ if(i_nend > i_ntell ) {
+ p_access->info.i_pos = i_ntell;
+ p_sys->i_icy_offset = i_ntell;
+ p_sys->i_remaining = i_nend+1-i_ntell;
+ int64_t i_size = (i_nsize > i_nend) ? i_nsize : (i_nend + 1);
+ if(i_size > p_access->info.i_size) {
+ p_sys->b_has_size = true;
+ p_access->info.i_size = i_size;
+ }
+ msg_Dbg( p_access, "stream size=%"PRIu64",pos=%"PRIu64",remaining=%"PRIu64,
+ i_nsize, i_ntell, p_sys->i_remaining);
+ }
+ }
+ else if( !strcasecmp( psz, "Connection" ) ) {
+ msg_Dbg( p_access, "Connection: %s",p );
+ int i = -1;
+ sscanf(p, "close%n",&i);
+ if( i >= 0 ) {
+ p_sys->b_persist = false;
}
}
else if( !strcasecmp( psz, "Location" ) )
{
- if( p_sys->psz_location ) free( p_sys->psz_location );
- p_sys->psz_location = strdup( p );
+ 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 ) )
+ {
+ if( asprintf(&psz_new_loc, "http%s://%s%s", psz_http_ext,
+ p_sys->url.psz_host, p) < 0 )
+ goto error;
+ }
+ else
+ {
+ if( asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext,
+ p_sys->url.psz_host, p_sys->url.i_port, p) < 0 )
+ goto error;
+ }
+ }
+ else
+ {
+ psz_new_loc = strdup( p );
+ }
+
+ free( p_sys->psz_location );
+ p_sys->psz_location = psz_new_loc;
}
else if( !strcasecmp( psz, "Content-Type" ) )
{
- if( p_sys->psz_mime ) free( p_sys->psz_mime );
+ free( p_sys->psz_mime );
p_sys->psz_mime = strdup( p );
msg_Dbg( p_access, "Content-Type: %s", p_sys->psz_mime );
}
+ else if( !strcasecmp( psz, "Content-Encoding" ) )
+ {
+ msg_Dbg( p_access, "Content-Encoding: %s", p );
+ if( !strcasecmp( p, "identity" ) )
+ ;
+#ifdef HAVE_ZLIB_H
+ else if( !strcasecmp( p, "gzip" ) || !strcasecmp( p, "deflate" ) )
+ p_sys->b_compressed = true;
+#endif
+ else
+ msg_Warn( p_access, "Unknown content coding: %s", p );
+ }
else if( !strcasecmp( psz, "Pragma" ) )
{
if( !strcasecmp( psz, "Pragma: features" ) )
- p_sys->b_mms = VLC_TRUE;
- if( p_sys->psz_pragma ) free( p_sys->psz_pragma );
+ p_sys->b_mms = true;
+ free( p_sys->psz_pragma );
p_sys->psz_pragma = strdup( p );
msg_Dbg( p_access, "Pragma: %s", p_sys->psz_pragma );
}
/* Let live 365 streams (nanocaster) piggyback on the icecast
* routine. They look very similar */
- p_sys->b_reconnect = VLC_TRUE;
- p_sys->b_pace_control = VLC_FALSE;
- p_sys->b_icecast = VLC_TRUE;
+ p_sys->b_reconnect = true;
+ p_sys->b_pace_control = false;
+ p_sys->b_icecast = true;
}
}
else if( !strcasecmp( psz, "Transfer-Encoding" ) )
msg_Dbg( p_access, "Transfer-Encoding: %s", p );
if( !strncasecmp( p, "chunked", 7 ) )
{
- p_sys->b_chunked = VLC_TRUE;
+ p_sys->b_chunked = true;
}
}
else if( !strcasecmp( psz, "Icy-MetaInt" ) )
p_sys->i_icy_meta = atoi( p );
if( p_sys->i_icy_meta < 0 )
p_sys->i_icy_meta = 0;
+ if( p_sys->i_icy_meta > 0 )
+ p_sys->b_icecast = true;
msg_Warn( p_access, "ICY metaint=%d", p_sys->i_icy_meta );
}
else if( !strcasecmp( psz, "Icy-Name" ) )
{
- if( p_sys->psz_icy_name ) free( p_sys->psz_icy_name );
- p_sys->psz_icy_name = strdup( p );
+ free( p_sys->psz_icy_name );
+ char *psz_tmp = strdup( p );
+ p_sys->psz_icy_name = EnsureUTF8( psz_tmp );
+ if( !p_sys->psz_icy_name )
+ free( psz_tmp );
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;
+ p_sys->b_icecast = true; /* be on the safeside. set it here as well. */
+ p_sys->b_reconnect = true;
+ p_sys->b_pace_control = false;
}
else if( !strcasecmp( psz, "Icy-Genre" ) )
{
- if( p_sys->psz_icy_genre ) free( p_sys->psz_icy_genre );
- p_sys->psz_icy_genre = strdup( p );
+ free( p_sys->psz_icy_genre );
+ char *psz_tmp = strdup( p );
+ p_sys->psz_icy_genre = EnsureUTF8( psz_tmp );
+ if( !p_sys->psz_icy_genre )
+ free( psz_tmp );
msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre );
}
else if( !strncasecmp( psz, "Icy-Notice", 10 ) )
{
msg_Dbg( p_access, "Meta-Info: %s: %s", psz, p );
}
+ else if( !strcasecmp( psz, "Set-Cookie" ) )
+ {
+ if( p_sys->cookies )
+ {
+ msg_Dbg( p_access, "Accepting Cookie: %s", p );
+ cookie_append( p_sys->cookies, strdup(p) );
+ }
+ else
+ msg_Dbg( p_access, "We have a Cookie we won't remember: %s", p );
+ }
+ else if( !strcasecmp( psz, "www-authenticate" ) )
+ {
+ msg_Dbg( p_access, "Authentication header: %s", p );
+ http_auth_ParseWwwAuthenticateHeader( VLC_OBJECT(p_access),
+ &p_sys->auth, p );
+ }
+ else if( !strcasecmp( psz, "proxy-authenticate" ) )
+ {
+ msg_Dbg( p_access, "Proxy authentication header: %s", p );
+ http_auth_ParseWwwAuthenticateHeader( VLC_OBJECT(p_access),
+ &p_sys->proxy_auth, p );
+ }
+ else if( !strcasecmp( psz, "authentication-info" ) )
+ {
+ msg_Dbg( p_access, "Authentication Info header: %s", p );
+ if( AuthCheckReply( p_access, p, &p_sys->url, &p_sys->auth ) )
+ goto error;
+ }
+ else if( !strcasecmp( psz, "proxy-authentication-info" ) )
+ {
+ msg_Dbg( p_access, "Proxy Authentication Info header: %s", p );
+ if( AuthCheckReply( p_access, p, &p_sys->proxy, &p_sys->proxy_auth ) )
+ goto error;
+ }
free( psz );
}
+ /* We close the stream for zero length data, unless of course the
+ * server has already promised to do this for us.
+ */
+ if( p_sys->b_has_size && p_sys->i_remaining == 0 && p_sys->b_persist ) {
+ Disconnect( p_access );
+ }
return VLC_SUCCESS;
error:
net_Close(p_sys->fd);
p_sys->fd = -1;
}
-
+
+}
+
+/*****************************************************************************
+ * Cookies (FIXME: we may want to rewrite that using a nice structure to hold
+ * them) (FIXME: only support the "domain=" param)
+ *****************************************************************************/
+
+/* Get the NAME=VALUE part of the Cookie */
+static char * cookie_get_content( const char * cookie )
+{
+ char * ret = strdup( cookie );
+ if( !ret ) return NULL;
+ char * str = ret;
+ /* Look for a ';' */
+ while( *str && *str != ';' ) str++;
+ /* Replace it by a end-char */
+ if( *str == ';' ) *str = 0;
+ return ret;
+}
+
+/* Get the domain where the cookie is stored */
+static char * cookie_get_domain( const char * cookie )
+{
+ const char * str = cookie;
+ static const char domain[] = "domain=";
+ if( !str )
+ return NULL;
+ /* Look for a ';' */
+ while( *str )
+ {
+ if( !strncmp( str, domain, sizeof(domain) - 1 /* minus \0 */ ) )
+ {
+ str += sizeof(domain) - 1 /* minus \0 */;
+ char * ret = strdup( str );
+ /* Now remove the next ';' if present */
+ char * ret_iter = ret;
+ while( *ret_iter && *ret_iter != ';' ) ret_iter++;
+ if( *ret_iter == ';' )
+ *ret_iter = 0;
+ return ret;
+ }
+ /* Go to next ';' field */
+ while( *str && *str != ';' ) str++;
+ if( *str == ';' ) str++;
+ /* skip blank */
+ while( *str && *str == ' ' ) str++;
+ }
+ return NULL;
+}
+
+/* Get NAME in the NAME=VALUE field */
+static char * cookie_get_name( const char * cookie )
+{
+ char * ret = cookie_get_content( cookie ); /* NAME=VALUE */
+ if( !ret ) return NULL;
+ char * str = ret;
+ while( *str && *str != '=' ) str++;
+ *str = 0;
+ return ret;
+}
+
+/* Add a cookie in cookies, checking to see how it should be added */
+static void cookie_append( vlc_array_t * cookies, char * cookie )
+{
+ int i;
+
+ if( !cookie )
+ return;
+
+ char * cookie_name = cookie_get_name( cookie );
+
+ /* Don't send invalid cookies */
+ if( !cookie_name )
+ return;
+
+ char * cookie_domain = cookie_get_domain( cookie );
+ for( i = 0; i < vlc_array_count( cookies ); i++ )
+ {
+ char * current_cookie = vlc_array_item_at_index( cookies, i );
+ char * current_cookie_name = cookie_get_name( current_cookie );
+ char * current_cookie_domain = cookie_get_domain( current_cookie );
+
+ assert( current_cookie_name );
+
+ bool is_domain_matching = ( cookie_domain && current_cookie_domain &&
+ !strcmp( cookie_domain, current_cookie_domain ) );
+
+ if( is_domain_matching && !strcmp( cookie_name, current_cookie_name ) )
+ {
+ /* Remove previous value for this cookie */
+ free( current_cookie );
+ vlc_array_remove( cookies, i );
+
+ /* Clean */
+ free( current_cookie_name );
+ free( current_cookie_domain );
+ break;
+ }
+ free( current_cookie_name );
+ free( current_cookie_domain );
+ }
+ free( cookie_name );
+ free( cookie_domain );
+ vlc_array_append( cookies, cookie );
+}
+
+
+/*****************************************************************************
+ * HTTP authentication
+ *****************************************************************************/
+
+static void AuthReply( access_t *p_access, const char *psz_prefix,
+ vlc_url_t *p_url, http_auth_t *p_auth )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ char *psz_value;
+
+ psz_value =
+ http_auth_FormatAuthorizationHeader( VLC_OBJECT(p_access), p_auth,
+ "GET", p_url->psz_path,
+ p_url->psz_username,
+ p_url->psz_password );
+ if ( psz_value == NULL )
+ return;
+
+ net_Printf( p_access, p_sys->fd, p_sys->p_vs,
+ "%sAuthorization: %s\r\n", psz_prefix, psz_value );
+ free( psz_value );
+}
+
+static int AuthCheckReply( access_t *p_access, const char *psz_header,
+ vlc_url_t *p_url, http_auth_t *p_auth )
+{
+ return
+ http_auth_ParseAuthenticationInfoHeader( VLC_OBJECT(p_access), p_auth,
+ psz_header, "",
+ p_url->psz_path,
+ p_url->psz_username,
+ p_url->psz_password );
}