/*****************************************************************************
* http.c: HTTP input module
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * 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
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_access.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 <zlib.h>
#endif
+#include <assert.h>
+
+#ifdef HAVE_PROXY_H
+# include "proxy.h"
+#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define PROXY_TEXT N_("HTTP proxy")
#define PROXY_LONGTEXT N_( \
"HTTP proxy to be used It must be of the form " \
- "http://[user[:pass]@]myproxy.mydomain:myport/ ; " \
+ "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_( \
"Caching value for HTTP streams. This " \
#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies Across http redirections ")
vlc_module_begin();
- set_description( _("HTTP input") );
- set_capability( "access2", 0 );
- set_shortname( _( "HTTP(S)" ) );
+ 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 );
+ CACHING_TEXT, CACHING_LONGTEXT, true );
add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
- AGENT_LONGTEXT, VLC_TRUE );
+ AGENT_LONGTEXT, true );
add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
- RECONNECT_LONGTEXT, VLC_TRUE );
+ RECONNECT_LONGTEXT, true );
add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,
- CONTINUOUS_LONGTEXT, VLC_TRUE );
+ CONTINUOUS_LONGTEXT, true );
add_bool( "http-forward-cookies", 0, NULL, FORWARD_COOKIES_TEXT,
- FORWARD_COOKIES_LONGTEXT, VLC_TRUE );
+ FORWARD_COOKIES_LONGTEXT, true );
add_obsolete_string("http-user");
add_obsolete_string("http-pwd");
add_shortcut( "http" );
* Local prototypes
*****************************************************************************/
-/* RFC 2617: Basic and Digest Access Authentification */
+/* RFC 2617: Basic and Digest Access Authentication */
typedef struct http_auth_t
{
char *psz_realm;
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_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
- vlc_bool_t b_compressed;
+ bool b_compressed;
struct
{
z_stream stream;
} inflate;
#endif
- vlc_bool_t b_chunked;
+ bool b_chunked;
int64_t i_chunk;
int i_icy_meta;
+ int64_t i_icy_offset;
char *psz_icy_name;
char *psz_icy_genre;
char *psz_icy_title;
- int i_remaining;
+ int64_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;
vlc_array_t * cookies;
};
access_sys_t *p_sys;
char *psz, *p;
/* Only forward an store cookies if the corresponding option is activated */
- vlc_bool_t b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
+ bool b_forward_cookies = var_CreateGetBool( p_access, "http-forward-cookies" );
vlc_array_t * saved_cookies = b_forward_cookies ? (cookies ?: vlc_array_new()) : NULL;
/* Set up p_access */
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 = VLC_FALSE;
+ 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->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_access->info.i_size = -1;
+ p_access->info.i_pos = 0;
+ p_access->info.b_eof = false;
p_sys->cookies = saved_cookies;
if( !strncmp( p_access->psz_access, "https", 5 ) )
{
/* HTTP over SSL */
- p_sys->b_ssl = VLC_TRUE;
+ p_sys->b_ssl = true;
if( p_sys->url.i_port <= 0 )
p_sys->url.i_port = 443;
}
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_CreateGetNonEmptyString( 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_PROXY_H
+ else
+ {
+ pxProxyFactory *pf = px_proxy_factory_new();
+ if (pf)
+ {
+ char *buf;
+ int i;
+ i=asprintf(&buf, "%s://%s", p_access->psz_access, p_access->psz_path);
+ 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");
+ }
}
-#ifdef HAVE_GETENV
+#elif HAVE_GETENV
else
{
- char *psz_proxy = getenv( "http_proxy" );
- if( psz_proxy && *psz_proxy )
+ psz = getenv( "http_proxy" );
+ if( psz )
{
- p_sys->b_proxy = VLC_TRUE;
- vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+ p_sys->b_proxy = true;
+ vlc_UrlParse( &p_sys->proxy, psz, 0 );
}
}
#endif
- free( psz );
+ if( psz ) /* No, this is NOT a use-after-free error */
+ {
+ psz = var_CreateGetNonEmptyString( p_access, "http-proxy-pwd" );
+ if( psz )
+ p_sys->proxy.psz_password = p_sys->psz_proxy_passbuf = psz;
+ }
if( p_sys->b_proxy )
{
}
if( p_sys->url.psz_username && *p_sys->url.psz_username )
{
- msg_Dbg( p_access, " user='%s', pwd='%s'",
- p_sys->url.psz_username, p_sys->url.psz_password );
+ msg_Dbg( p_access, " user='%s'", p_sys->url.psz_username );
}
p_sys->b_reconnect = var_CreateGetBool( p_access, "http-reconnect" );
/* Retry with http 1.0 */
msg_Dbg( p_access, "switching to HTTP version 1.0" );
p_sys->i_version = 0;
- p_sys->b_seekable = VLC_FALSE;
+ p_sys->b_seekable = false;
- if( p_access->b_die || Connect( p_access, 0 ) )
+ if( !vlc_object_alive (p_access) || Connect( p_access, 0 ) )
goto error;
#ifndef NDEBUG
if( p_sys->i_code == 401 )
{
- char *psz_login = NULL; char *psz_password = NULL;
+ char *psz_login = NULL, *psz_password = NULL;
char psz_msg[250];
int i_ret;
/* FIXME ? */
vlc_UrlClean( &p_sys->url );
AuthReset( &p_sys->auth );
vlc_UrlClean( &p_sys->proxy );
+ free( p_sys->psz_proxy_passbuf );
AuthReset( &p_sys->proxy_auth );
free( p_sys->psz_mime );
free( p_sys->psz_pragma );
{
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 );
#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;
+ p_sys->b_pace_control = false;
#endif
}
else if( !p_sys->psz_mime )
{
- /* Shoutcast */
- p_access->psz_demux = strdup( "mp3" );
+ free( p_access->psz_demux );
+ /* Shoutcast */
+ p_access->psz_demux = strdup( "mp3" );
}
/* else probably Ogg Vorbis */
}
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( p_access->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 );
+ free( p_sys->psz_proxy_passbuf );
free( p_sys->psz_mime );
free( p_sys->psz_pragma );
free( p_sys->psz_location );
if( p_sys->fd < 0 )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
- if( p_access->info.i_size > 0 &&
+ if( p_access->info.i_size >= 0 &&
i_len + p_access->info.i_pos > p_access->info.i_size )
{
if( ( i_len = p_access->info.i_size - p_access->info.i_pos ) == 0 )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
}
{
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 ) /* eof */
{
p_sys->i_chunk = -1;
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
}
i_len = p_sys->i_chunk;
}
}
-
- if( p_sys->b_continuous && (ssize_t)i_len > p_sys->i_remaining )
- {
+ else if( p_access->info.i_size != -1 && (int64_t)i_len > p_sys->i_remaining) {
/* 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 = (size_t)p_sys->i_remaining;
+ if(i_len == 0) {
+ p_access->info.b_eof = true;
+ return 0;
}
- i_len = i_new_len;
}
- 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 )
{
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;
}
Disconnect( p_access );
if( p_sys->b_reconnect )
}
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;
}
}
- if( i_read == 0 ) p_access->info.b_eof = VLC_TRUE;
+ if( i_read == 0 ) p_access->info.b_eof = true;
}
- if( p_sys->b_continuous )
+ if( p_access->info.i_size != -1 )
{
p_sys->i_remaining -= i_read;
}
/* Read meta data length */
i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1,
- VLC_TRUE );
+ true );
if( i_read <= 0 )
return VLC_EGENERIC;
if( buffer == 0 )
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 )
+ (uint8_t *)psz_meta, i_read, true ) != i_read )
return VLC_EGENERIC;
psz_meta[i_read] = '\0'; /* Just in case */
strcmp( p_sys->psz_icy_title, &p[1] ) )
{
free( p_sys->psz_icy_title );
- p_sys->psz_icy_title = strdup( &p[1] );
+ p_sys->psz_icy_title = EnsureUTF8( strdup( &p[1] ));
p_access->info.i_update |= INPUT_UPDATE_META;
msg_Dbg( p_access, "New Title=%s", p_sys->psz_icy_title );
*****************************************************************************/
static int Seek( access_t *p_access, int64_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
+ && (uint64_t)i_pos >= (uint64_t)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;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
vlc_meta_t *p_meta;
{
/* */
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 = VLC_TRUE;
+ *pb_bool = true;
break;
/* */
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_access->info.i_size = 0;
+ p_access->info.i_size = -1;
p_access->info.i_pos = i_tell;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
/* Open connection */
}
/* Initialize TLS/SSL session */
- 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 )
free( psz );
- if( p_access->b_die || p_access->b_error )
+ if( !vlc_object_alive (p_access) || p_access->b_error )
{
Disconnect( p_access );
return -1;
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, 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 )
{
+ p_sys->b_persist = true;
net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
- "Range: bytes="I64Fd"-\r\n", i_tell );
+ "Range: bytes=%"PRIu64"-\r\n", i_tell );
}
/* Cookies */
assert( psz_cookie_content );
/* FIXME: This is clearly not conforming to the rfc */
- vlc_bool_t is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain ));
+ bool is_in_right_domain = (!psz_cookie_domain || strstr( p_sys->url.psz_host, psz_cookie_domain ));
if( is_in_right_domain )
{
net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "Icy-MetaData: 1\r\n" );
- if( p_sys->b_continuous )
- {
- net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
- "Connection: Keep-Alive\r\n" );
- }
- else if( p_sys->i_version == 1 )
- {
- net_Printf( VLC_OBJECT( p_access ), p_sys->fd, pvs,
- "Connection: Close\r\n");
- }
-
if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "\r\n" ) < 0 )
{
msg_Err( p_access, "failed to send request" );
{
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 = VLC_FALSE;
+ p_sys->b_seekable = false;
}
/* Authentication error - We'll have to display the dialog */
if( p_sys->i_code == 401 )
goto error;
}
- if( p_access->b_die || p_access->b_error )
+ if( !vlc_object_alive (p_access) || p_access->b_error )
{
free( psz );
goto error;
if( !strcasecmp( psz, "Content-Length" ) )
{
- if( p_sys->b_continuous )
- {
- p_access->info.i_size = -1;
- msg_Dbg( p_access, "this frame size=%lld", atoll(p ) );
- p_sys->i_remaining = atoll( p );
+ int64_t i_size = i_tell + (p_sys->i_remaining = atoll( p ));
+ if(i_size > p_access->info.i_size) {
+ 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=%"PRId64, 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);
+ if(i_nend > i_ntell ) {
+ p_access->info.i_pos = 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_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);
+ }
+ }
+ 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" ) )
msg_Dbg( p_access, "Content-Encoding: %s", p );
if( strcasecmp( p, "identity" ) )
#ifdef HAVE_ZLIB_H
- p_sys->b_compressed = VLC_TRUE;
+ p_sys->b_compressed = true;
#else
msg_Warn( p_access, "Compressed content not supported. Rebuild with zlib support." );
#endif
else if( !strcasecmp( psz, "Pragma" ) )
{
if( !strcasecmp( psz, "Pragma: features" ) )
- p_sys->b_mms = VLC_TRUE;
+ 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" ) )
else if( !strcasecmp( psz, "Icy-Name" ) )
{
free( p_sys->psz_icy_name );
- p_sys->psz_icy_name = strdup( p );
+ p_sys->psz_icy_name = EnsureUTF8( 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;
+ 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" ) )
{
free( p_sys->psz_icy_genre );
- p_sys->psz_icy_genre = strdup( p );
+ p_sys->psz_icy_genre = EnsureUTF8( strdup( p ));
msg_Dbg( p_access, "Icy-Genre: %s", p_sys->psz_icy_genre );
}
else if( !strncasecmp( psz, "Icy-Notice", 10 ) )
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_access->info.i_size != -1 && p_sys->i_remaining == 0 && p_sys->b_persist ) {
+ Disconnect( p_access );
+ }
return VLC_SUCCESS;
error:
assert( current_cookie_name );
- vlc_bool_t is_domain_matching = ( cookie_domain && current_cookie_domain &&
+ 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 ) )
}
/*****************************************************************************
- * "RFC 2617: Basic and Digest Access Authentification" header parsing
+ * "RFC 2617: Basic and Digest Access Authentication" header parsing
*****************************************************************************/
static char *AuthGetParam( const char *psz_header, const char *psz_param )
{
projects / vlc / blobdiff