* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.39 2003/07/31 18:25:12 bigben Exp $
+ * $Id: http.c,v 1.47 2003/12/21 23:32:58 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* Preamble
*****************************************************************************/
#include <stdlib.h>
-#include <string.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#define PROXY_TEXT N_("Specify an HTTP proxy")
#define PROXY_LONGTEXT N_( \
"Specify an HTTP proxy to use. It must be in the form " \
- "http://myproxy.mydomain:myport. If none is specified, the HTTP_PROXY " \
+ "http://myproxy.mydomain:myport/. If none is specified, the HTTP_PROXY " \
"environment variable will be tried." )
#define CACHING_TEXT N_("Caching value in ms")
"Range: bytes="I64Fd"-\r\n"
HTTP_USERAGENT
"%s"
+ "Connection: Close\r\n"
HTTP_END,
p_access_data->psz_buffer, i_tell, p_access_data->psz_auth_string );
}
"%s"
HTTP_USERAGENT
"%s"
+ "Connection: Close\r\n"
HTTP_END,
p_access_data->psz_buffer, p_access_data->psz_auth_string );
}
return VLC_EGENERIC;
}
+ /* Check for buggy Icecast servers */
+ if( strstr( psz_parser , "x-audiocast") )
+ {
+ i_protocol = ICY_PROTOCOL;
+ if( !p_input->psz_demux || !*p_input->psz_demux )
+ {
+ msg_Info( p_input, "ICY server found, mp3 demuxer selected" );
+ p_input->psz_demux = "mp3"; // FIXME strdup ?
+ }
+ }
+
/* Check the HTTP return code */
i_code = atoi( (char*)psz_parser );
msg_Dbg( p_input, "%s server replied: %i",
if( !strcasecmp( psz_line, "Content-Length" ) )
{
off_t i_size = 0;
-#ifdef HAVE_ATOLL
- i_size = i_tell + atoll( psz_value );
-#else
- int sign = 1;
- if( *psz_value == '-' ) sign = -1;
- while( *psz_value >= '0' && *psz_value <= '9' )
- {
- i_size = i_size * 10 + *psz_value++ - '0';
- }
- i_size = i_tell + ( i_size * sign );
-#endif
+ i_size = i_tell + atoll( psz_value );
msg_Dbg( p_input, "stream size is "I64Fd, i_size );
vlc_mutex_lock( &p_input->stream.stream_lock );
* Encode a string in base64
* Code borrowed from Rafael Steil
*****************************************************************************/
-
-
-
void encodeblock( unsigned char in[3], unsigned char out[4], int len )
{
- static const char cb64[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ static const char cb64[]
+ = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
out[0] = cb64[ in[0] >> 2 ];
out[1] = cb64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ];
out[2] = (unsigned char) (len > 1 ? cb64[ ((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6) ] : '=');
out[3] = (unsigned char) (len > 2 ? cb64[ in[2] & 0x3f ] : '=');
}
-char *str_base64_encode(char *str, input_thread_t *p_input )
+char *str_base64_encode(char *psz_str, input_thread_t *p_input )
{
unsigned char in[3], out[4];
- unsigned int i, len, blocksout = 0, linesize = strlen(str);
- char *tmp = str;
- char *result = (char *)malloc((linesize + 3 - linesize % 3) * 4 / 3 + 1);
-
- if (!result)
- msg_Err( p_input, "out of memory" );
- while (*tmp) {
+ unsigned int i, len, blocksout = 0, linesize = strlen(psz_str);
+ char *psz_tmp = psz_str;
+ char *psz_result = (char *)malloc( linesize / 3 * 4 + 5 );
+
+ if( !psz_result )
+ {
+ msg_Err( p_input, "out of memory" );
+ return NULL;
+ }
+
+ while( *psz_tmp )
+ {
len = 0;
-
- for( i = 0; i < 3; i++ ) {
- in[i] = (unsigned char)(*tmp);
-
- if (*tmp)
+
+ for( i = 0; i < 3; i++ )
+ {
+ in[i] = (unsigned char)*psz_tmp;
+
+ if (*psz_tmp)
len++;
else
in[i] = 0;
-
- tmp++;
+
+ psz_tmp++;
}
-
- if( len ) {
- encodeblock( in, out, len);
-
- for( i = 0; i < 4; i++ )
- result[blocksout++] = out[i];
- }
- }
-
- result[blocksout] = '\0';
- return result;
-}
+ if( len )
+ {
+ encodeblock( in, out, len );
+
+ for( i = 0; i < 4; i++ )
+ {
+ psz_result[blocksout++] = out[i];
+ }
+ }
+ }
+
+ psz_result[blocksout] = '\0';
+ return psz_result;
+}
/*****************************************************************************
* Open: parse URL and open the remote file at the beginning
char * psz_proxy, *psz_proxy_orig;
char * psz_user = NULL, *psz_pwd = NULL;
int i_server_port = 0;
+ vlc_value_t val;
p_access_data = malloc( sizeof(_input_socket_t) );
p_input->p_access_data = (access_sys_t *)p_access_data;
p_access_data->psz_name = psz_name;
p_access_data->psz_network = "";
memset(p_access_data->psz_auth_string, 0, MAX_QUERY_SIZE);
- if( config_GetInt( p_input, "ipv4" ) )
+
+ var_Create( p_input, "ipv4", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "ipv4", &val );
+ if( val.i_int )
{
p_access_data->psz_network = "ipv4";
}
- if( config_GetInt( p_input, "ipv6" ) )
+ var_Create( p_input, "ipv6", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "ipv6", &val );
+ if( val.i_int )
{
p_access_data->psz_network = "ipv6";
}
/* Handle autehtification */
- if ( psz_user == NULL )
+ if ( !psz_user )
{
- psz_user = config_GetPsz( p_input, "http-user" );
- psz_pwd = config_GetPsz( p_input, "http-pwd" );
- }
+ var_Create( p_input, "http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "http-user", &val );
+ psz_user = val.psz_string;
- if (psz_user != NULL)
+ var_Create( p_input, "http-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "http-pwd", &val );
+ psz_pwd = val.psz_string;
+ }
+
+ if ( *psz_user )
{
- msg_Dbg( p_input, "Authentificating, user=%s, password=%s",
- psz_user, psz_pwd );
char psz_user_pwd[MAX_QUERY_SIZE];
+ msg_Dbg( p_input, "authenticating, user=%s, password=%s",
+ psz_user, psz_pwd );
snprintf( psz_user_pwd, MAX_QUERY_SIZE, "%s:%s", psz_user, psz_pwd );
- snprintf( p_access_data->psz_auth_string, MAX_QUERY_SIZE,
- "Authorization: Basic %s\r\n",
- str_base64_encode( psz_user_pwd, p_input ) );
+ snprintf( p_access_data->psz_auth_string, MAX_QUERY_SIZE,
+ "Authorization: Basic %s\r\n",
+ str_base64_encode( psz_user_pwd, p_input ) );
}
/* Check proxy config variable */
- psz_proxy_orig = config_GetPsz( p_input, "http-proxy" );
+ var_Create( p_input, "http-proxy", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "http-proxy", &val );
+ psz_proxy_orig = val.psz_string;
if( psz_proxy_orig == NULL )
{
/* Check proxy environment variable */
p_access_data->socket_desc.psz_server_addr = psz_proxy;
p_access_data->socket_desc.i_server_port = i_proxy_port;
p_access_data->socket_desc.i_type = NETWORK_TCP;
+ p_access_data->socket_desc.i_ttl = 0;
snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE,
"GET http://%s:%d/%s HTTP/1.0\r\n",
p_access_data->socket_desc.i_type = NETWORK_TCP;
p_access_data->socket_desc.psz_server_addr = psz_server_addr;
p_access_data->socket_desc.i_server_port = i_server_port;
+ p_access_data->socket_desc.i_ttl = 0;
snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE,
"GET /%s HTTP/1.1\r\nHost: %s\r\n",
}
/* Update default_pts to a suitable value for http access */
- p_input->i_pts_delay = config_GetInt( p_input, "http-caching" ) * 1000;
+
+ var_Create( p_input, "http-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_input, "http-caching", &val );
+ p_input->i_pts_delay = val.i_int * 1000;
return VLC_SUCCESS;
}
projects / vlc / blobdiff