#endif
#ifdef WIN32
-# include <Windows.h>
+# include <windows.h>
#endif
/*****************************************************************************
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
change_safe()
- add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, true )
+ add_string( "http-user-agent", PACKAGE_NAME"/"PACKAGE_VERSION, 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,
#endif
add_obsolete_string("http-user")
add_obsolete_string("http-pwd")
- add_shortcut( "http" )
- add_shortcut( "https" )
- add_shortcut( "unsv" )
- add_shortcut( "itpc" ) /* iTunes Podcast */
- add_shortcut( "icyx" )
+ /* 'itpc' = iTunes Podcast */
+ add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
set_callbacks( Open, Close )
vlc_module_end ()
struct access_sys_t
{
int fd;
+ bool b_error;
tls_session_t *p_tls;
v_socket_t *p_vs;
int64_t i_chunk;
int i_icy_meta;
- int64_t i_icy_offset;
+ uint64_t i_icy_offset;
char *psz_icy_name;
char *psz_icy_genre;
char *psz_icy_title;
- int64_t i_remaining;
+ uint64_t i_remaining;
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 ssize_t Read( access_t *, uint8_t *, size_t );
static ssize_t ReadCompressed( access_t *, uint8_t *, size_t );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
/* */
-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. */
{
access_t *p_access = (access_t*)p_this;
return OpenWithCookies( p_this, p_access->psz_access, 0,
- var_CreateGetInteger( p_access, "http-max-redirect" ), NULL );
+ var_InheritInteger( p_access, "http-max-redirect" ), NULL );
}
/**
char *psz, *p;
/* Only forward an store cookies if the corresponding option is activated */
- bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
+ 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_sys->psz_icy_title = NULL;
p_sys->i_remaining = 0;
p_sys->b_persist = false;
- p_access->info.i_size = -1;
+ p_sys->b_has_size = false;
+ p_access->info.i_size = 0;
p_access->info.i_pos = 0;
p_access->info.b_eof = false;
http_auth_Init( &p_sys->proxy_auth );
/* Parse URI - remove spaces */
- p = psz = strdup( p_access->psz_path );
+ p = psz = strdup( p_access->psz_location );
while( (p = strchr( p, ' ' )) != NULL )
*p = '+';
vlc_UrlParse( &p_sys->url, psz, 0 );
p_sys->url.i_port = 80;
}
- /* Do user agent */
- p_sys->psz_user_agent = var_CreateGetString( p_access, "http-user-agent" );
+ /* 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++ )
+ {
+ uint8_t c = *p;
+ if( c < 32 || strchr( "()<>@,;:\\\"[]?={}", c ) )
+ *p = '_'; /* remove potentially harmful characters */
+ }
/* Check proxy */
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy" );
+ psz = var_InheritString( p_access, "http-proxy" );
if( psz )
{
p_sys->b_proxy = true;
{
char *buf;
int i;
- i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_path);
+ i=asprintf(&buf, "%s://%s", psz_access, p_access->psz_location);
if (i >= 0)
{
msg_Dbg(p_access, "asking libproxy about url '%s'", buf);
#elif defined( WIN32 )
else
{
- if( var_CreateGetBool( p_access, "http-use-IE-proxy" ) )
+ 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;
{
/* Get the proxy URL :
Proxy server value in the registry can be something like "address:port"
- or "ftp=adress1:port1;http=adress2:port2 ..." depending of the
+ or "ftp=address1:port1;http=address2:port2 ..." depending of the
confirguration. */
char *psz_proxy;
psz_proxy = strstr( psz_key, "http=" );
"in registry." );
}
}
-#elif HAVE_GETENV
+#elif defined( HAVE_GETENV )
else
{
psz = getenv( "http_proxy" );
if( psz ) /* No, this is NOT a use-after-free error */
{
- psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" );
+ psz = var_InheritString( p_access, "http-proxy-pwd" );
if( psz )
p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
}
}
}
- 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,
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 */
msg_Err( p_access, "insecure redirection ignored" );
goto error;
}
- free( p_access->psz_path );
- p_access->psz_path = strdup( p_sys->psz_location );
+ 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 );
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 = 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( i_len > p_sys->i_chunk )
- {
i_len = p_sys->i_chunk;
- }
- }
- else if( p_access->info.i_size != -1 && (int64_t)i_len > p_sys->i_remaining) {
- /* Only ask for the remaining length */
- i_len = (size_t)p_sys->i_remaining;
- if(i_len == 0) {
- p_access->info.b_eof = true;
- return 0;
- }
}
+ if( i_len == 0 )
+ {
+ p_access->info.b_eof = true;
+ return 0;
+ }
if( p_sys->i_icy_meta > 0 && p_access->info.i_pos-p_sys->i_icy_offset > 0 )
{
if( i_read > 0 )
{
- p_access->info.i_pos += i_read;
-
if( p_sys->b_chunked )
{
p_sys->i_chunk -= i_read;
}
}
}
- else if( i_read <= 0 )
+ else
{
/*
* I very much doubt that this will work.
p_sys->b_reconnect = false;
i_read = Read( p_access, p_buffer, i_len );
p_sys->b_reconnect = true;
+
+ return i_read;
}
}
- if( i_read == 0 )
+ if( i_read <= 0 )
+ {
p_access->info.b_eof = true;
- else if( i_read < 0 )
- p_access->b_error = true;
+ if( i_read < 0 )
+ p_sys->b_error = true;
+ return 0;
+ }
}
- if( p_access->info.i_size != -1 )
+ 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;
}
/*****************************************************************************
* 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 %"PRId64, i_pos );
Disconnect( p_access );
if( p_access->info.i_size
- && (uint64_t)i_pos >= (uint64_t)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 ) {
/* */
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;
/* */
/*****************************************************************************
* 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;
p_sys->psz_icy_title = NULL;
p_sys->i_remaining = 0;
p_sys->b_persist = false;
-
- p_access->info.i_size = -1;
+ p_sys->b_has_size = false;
+ p_access->info.i_size = 0;
p_access->info.i_pos = i_tell;
p_access->info.b_eof = false;
return -1;
}
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+ 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,
free( psz );
- if( !vlc_object_alive (p_access) || p_access->b_error )
+ if( !vlc_object_alive (p_access) || p_sys->b_error )
{
Disconnect( p_access );
return -1;
}
-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 ;
{
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 );
}
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 && ! p_sys->b_continuous )
{
p_sys->b_persist = true;
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+ 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" );
}
/* Cookies */
if( is_in_right_domain )
{
msg_Dbg( p_access, "Sending Cookie %s", psz_cookie_content );
- if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Cookie: %s\r\n", psz_cookie_content ) < 0 )
+ 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 );
AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth );
/* ICY meta data request */
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
+ net_Printf( p_access, p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
- 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 );
goto error;
}
- if( !vlc_object_alive (p_access) || p_access->b_error )
+ if( !vlc_object_alive (p_access) || p_sys->b_error )
{
free( psz );
goto error;
if( !strcasecmp( psz, "Content-Length" ) )
{
- int64_t i_size = i_tell + (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;
}
- msg_Dbg( p_access, "this frame size=%"PRId64, p_sys->i_remaining );
+ msg_Dbg( p_access, "this frame size=%"PRIu64, p_sys->i_remaining );
}
else if( !strcasecmp( psz, "Content-Range" ) ) {
- int64_t i_ntell = i_tell;
- int64_t i_nend = (p_access->info.i_size > 0)?(p_access->info.i_size - 1):i_tell;
- int64_t i_nsize = p_access->info.i_size;
- sscanf(p,"bytes %"PRId64"-%"PRId64"/%"PRId64,&i_ntell,&i_nend,&i_nsize);
+ 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=%"PRId64",pos=%"PRId64",remaining=%"PRId64,i_nsize,i_ntell,p_sys->i_remaining);
+ msg_Dbg( p_access, "stream size=%"PRIu64",pos=%"PRIu64",remaining=%"PRIu64,
+ i_nsize, i_ntell, p_sys->i_remaining);
}
}
else if( !strcasecmp( psz, "Connection" ) ) {
else if( !strcasecmp( psz, "Content-Encoding" ) )
{
msg_Dbg( p_access, "Content-Encoding: %s", p );
- if( strcasecmp( p, "identity" ) )
+ if( !strcasecmp( p, "identity" ) )
+ ;
#ifdef HAVE_ZLIB_H
+ else if( !strcasecmp( p, "gzip" ) || !strcasecmp( p, "deflate" ) )
p_sys->b_compressed = true;
-#else
- msg_Warn( p_access, "Compressed content not supported. Rebuild with zlib support." );
#endif
+ else
+ msg_Warn( p_access, "Unknown content coding: %s", p );
}
else if( !strcasecmp( psz, "Pragma" ) )
{
/* We close the stream for zero length data, unless of course the
* server has already promised to do this for us.
*/
- if( p_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) {
+ if( p_sys->b_has_size && p_sys->i_remaining == 0 && p_sys->b_persist ) {
Disconnect( p_access );
}
return VLC_SUCCESS;
if ( psz_value == NULL )
return;
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, p_sys->p_vs,
+ net_Printf( p_access, p_sys->fd, p_sys->p_vs,
"%sAuthorization: %s\r\n", psz_prefix, psz_value );
free( psz_value );
}
projects / vlc / blobdiff