Skip to content

V
vlc-1.1
Commit 5cfcac85 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* http: complete rewrite (using net_Printf/net_Gets) 

        -> Proxy, user/password and redirection untested.
        -> For icecast server, check also the mime (do not blindly force
        mp3, it could also be nsv).
parent be5afcff
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 669 deletions
modules/access/http.c
View file @ 5cfcac85
/***************************************************************************** /*****************************************************************************
* http.c: HTTP access plug-in * http.c: HTTP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001-2004 VideoLAN
* $Id: http.c,v 1.50 2004/01/05 13:07:02 zorglub Exp $ * $Id: http.c,v 1.51 2004/01/07 15:21:27 fenrir Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -25,51 +26,19 @@ ...@@ -25,51 +26,19 @@
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h> #include <vlc/input.h>
#ifdef HAVE_ERRNO_H
# include <errno.h>
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#if defined( UNDER_CE )
# include <winsock.h>
#elif defined( WIN32 )
# include <winsock2.h>
# include <ws2tcpip.h>
# ifndef IN_MULTICAST
# define IN_MULTICAST(a) IN_CLASSD(a)
# endif
#else
# include <sys/socket.h>
#endif
#include "vlc_playlist.h" #include "vlc_playlist.h"
#include "network.h" #include "network.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void Seek ( input_thread_t *, off_t );
static ssize_t Read ( input_thread_t *, byte_t *, size_t );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define PROXY_TEXT N_("Specify an HTTP proxy") #define PROXY_TEXT N_("Specify an HTTP proxy")
#define PROXY_LONGTEXT N_( \ #define PROXY_LONGTEXT N_( \
"Specify an HTTP proxy to use. It must be in the form " \ "Specify an HTTP proxy to use. It must be in the form " \
...@@ -82,13 +51,14 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t ); ...@@ -82,13 +51,14 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
"value should be set in millisecond units." ) "value should be set in millisecond units." )
vlc_module_begin(); vlc_module_begin();
add_category_hint( N_("http"), NULL, VLC_FALSE );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, VLC_FALSE );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "http-user", NULL, NULL, "HTTP user name", "HTTP user name for Basic Authentification", VLC_FALSE );
add_string( "http-pwd", NULL , NULL, "HTTP password", "HTTP password for Basic Authentification", VLC_FALSE );
set_description( _("HTTP input") ); set_description( _("HTTP input") );
set_capability( "access", 0 ); set_capability( "access", 0 );
add_category_hint( N_("http"), NULL, VLC_FALSE );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, VLC_FALSE );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "http-user", NULL, NULL, "HTTP user name", "HTTP user name for Basic Authentification", VLC_FALSE );
add_string( "http-pwd", NULL , NULL, "HTTP password", "HTTP password for Basic Authentification", VLC_FALSE );
add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, "HTTP user agent", "HTTP user agent", VLC_FALSE );
add_shortcut( "http" ); add_shortcut( "http" );
add_shortcut( "http4" ); add_shortcut( "http4" );
add_shortcut( "http6" ); add_shortcut( "http6" );
...@@ -96,787 +66,568 @@ vlc_module_begin(); ...@@ -96,787 +66,568 @@ vlc_module_begin();
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
* _input_socket_t: private access plug-in data, modified to add private * Local prototypes
* fields
*****************************************************************************/ *****************************************************************************/
#define MAX_ANSWER_SIZE 1024 struct access_sys_t
#define MAX_QUERY_SIZE 1024
typedef struct _input_socket_s
{ {
input_socket_t _socket; int fd;
char * psz_network; /* From uri */
network_socket_t socket_desc; vlc_url_t url;
char psz_buffer[MAX_QUERY_SIZE]; char *psz_user;
char psz_auth_string[MAX_QUERY_SIZE]; char *psz_passwd;
char * psz_name; char *psz_user_agent;
} _input_socket_t;
/***************************************************************************** /* Proxy */
* HTTPConnect: connect to the server and seek to i_tell vlc_bool_t b_proxy;
*****************************************************************************/ vlc_url_t proxy;
static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
{
char psz_buffer[MAX_QUERY_SIZE];
_input_socket_t * p_access_data;
module_t * p_network;
char * psz_parser, * psz_value, * psz_answer;
byte_t * p_bytes;
int i_code, i_ret, i, i_size;
enum { HTTP_PROTOCOL, ICY_PROTOCOL } i_protocol; /* */
int i_code;
char *psz_protocol;
int i_version;
/* Find an appropriate network module */ char *psz_mime;
p_access_data = (_input_socket_t *)p_input->p_access_data; char *psz_location;
p_input->p_private = (void*) &p_access_data->socket_desc;
p_network = module_Need( p_input, "network", p_access_data->psz_network );
if( p_network == NULL )
{
return VLC_ENOMOD;
}
module_Unneed( p_input, p_network );
p_access_data->_socket.i_handle = p_access_data->socket_desc.i_handle; int64_t i_tell;
int64_t i_size;
};
# define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n" static void Seek( input_thread_t *, off_t );
# define HTTP_END "\r\n" static ssize_t Read( input_thread_t *, byte_t *, size_t );
/* Build the query string */ static void ParseURL( access_sys_t *, char *psz_url );
if ( p_input->stream.b_seekable ) static int Connect( input_thread_t *, vlc_bool_t *, off_t *, off_t );
{
snprintf( psz_buffer, MAX_QUERY_SIZE,
"%s"
"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 );
}
else
{
snprintf( psz_buffer, MAX_QUERY_SIZE,
"%s"
HTTP_USERAGENT
"%s"
"Connection: Close\r\n"
HTTP_END,
p_access_data->psz_buffer, p_access_data->psz_auth_string );
}
psz_buffer[MAX_QUERY_SIZE - 1] = '\0';
/* Send GET query */
i_ret = send( p_access_data->_socket.i_handle,
psz_buffer, strlen( psz_buffer ), 0 );
if( i_ret == -1 )
{
#ifdef HAVE_ERRNO_H
msg_Err( p_input, "cannot send request (%s)", strerror(errno) );
#else
msg_Err( p_input, "cannot send request" );
#endif
Close( VLC_OBJECT(p_input) );
return VLC_EGENERIC;
}
/* Prepare the input thread for reading. */ static char *b64_encode( unsigned char *src );
p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
/* FIXME: we shouldn't have to do that ! It's UGLY but mandatory because /*****************************************************************************
* input_FillBuffer assumes p_input->pf_read exists */ * Open:
p_input->pf_read = Read; *****************************************************************************/
static int Open ( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t*)p_this;
access_sys_t *p_sys;
vlc_value_t val;
/* Create private struct */
p_sys = p_input->p_access_data = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->fd = -1;
p_sys->b_proxy = VLC_FALSE;
p_sys->i_version = 1;
p_sys->psz_mime = NULL;
p_sys->psz_location = NULL;
p_sys->psz_user_agent = NULL;
/* First set ipv4/ipv6 */
var_Create( p_input, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_input, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
while( !input_FillBuffer( p_input ) ) if( *p_input->psz_access )
{ {
if( p_input->b_die || p_input->b_error ) /* Find out which shortcut was used */
if( !strncmp( p_input->psz_access, "http4", 6 ) )
{
val.b_bool = VLC_TRUE;
var_Set( p_input, "ipv4", val );
val.b_bool = VLC_FALSE;
var_Set( p_input, "ipv6", val );
}
else if( !strncmp( p_input->psz_access, "http6", 6 ) )
{ {
Close( VLC_OBJECT(p_input) ); val.b_bool = VLC_TRUE;
return VLC_EGENERIC; var_Set( p_input, "ipv6", val );
val.b_bool = VLC_FALSE;
var_Set( p_input, "ipv4", val );
} }
} }
/* Get the HTTP returncode */ /* Parse URI */
i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE ); ParseURL( p_sys, p_input->psz_name );
psz_parser = (char *)p_bytes; if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
if( i_size <= 0 )
{ {
msg_Err( p_input, "not enough data" ); msg_Warn( p_input, "invalid host" );
Close( VLC_OBJECT(p_input) ); goto error;
return VLC_EGENERIC;
} }
if( p_sys->url.i_port <= 0 )
/* Guess the protocol */
if( ( ( (size_t)i_size >= strlen("HTTP/1.x") ) &&
!strncmp( psz_parser, "HTTP/1.", strlen("HTTP/1.") ) ) )
{ {
i_protocol = HTTP_PROTOCOL; p_sys->url.i_port = 80;
}
if( !p_sys->psz_user || *p_sys->psz_user == '\0' )
{
var_Create( p_input, "http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_input, "http-user", &val );
p_sys->psz_user = val.psz_string;
psz_parser += strlen("HTTP/1.x"); var_Create( p_input, "http-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
i_size -= strlen("HTTP/1.x"); var_Get( p_input, "http-pwd", &val );
p_sys->psz_passwd = val.psz_string;
} }
else if( ( (size_t)i_size >= strlen("ICY") &&
!strncmp( psz_parser, "ICY", strlen("ICY") ) ) ) /* Do user agent */
var_Create( p_input, "http-user-agent", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_input, "http-user-agent", &val );
p_sys->psz_user_agent = val.psz_string;
/* Check proxy */
var_Create( p_input, "http-proxy", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_input, "http-proxy", &val );
if( val.psz_string && *val.psz_string )
{
p_sys->b_proxy = VLC_TRUE;
vlc_UrlParse( &p_sys->proxy, val.psz_string, 0 );
}
else
{ {
i_protocol = ICY_PROTOCOL; char *psz_proxy = getenv( "http_proxy" );
if( !p_input->psz_demux || !*p_input->psz_demux ) if( psz_proxy && *psz_proxy )
{ {
msg_Info( p_input, "ICY server found, mp3 demuxer selected" ); p_sys->b_proxy = VLC_TRUE;
p_input->psz_demux = "mp3"; // FIXME strdup ? vlc_UrlParse( &p_sys->proxy, val.psz_string, 0 );
}
if( psz_proxy )
{
free( psz_proxy );
} }
psz_parser += strlen("ICY");
i_size -= strlen("ICY");
} }
else if( val.psz_string )
{ {
msg_Err( p_input, "invalid HTTP reply '%s'", psz_parser ); free( val.psz_string );
return VLC_EGENERIC;
} }
/* Check for buggy Icecast servers */ if( p_sys->b_proxy )
if( strstr( psz_parser , "x-audiocast") )
{ {
i_protocol = ICY_PROTOCOL; if( p_sys->proxy.psz_host == NULL || *p_sys->proxy.psz_host == '\0' )
if( !p_input->psz_demux || !*p_input->psz_demux ) {
msg_Warn( p_input, "invalid proxy host" );
goto error;
}
if( p_sys->proxy.i_port <= 0 )
{ {
msg_Info( p_input, "ICY server found, mp3 demuxer selected" ); p_sys->proxy.i_port = 80;
p_input->psz_demux = "mp3"; // FIXME strdup ?
} }
} }
/* Check the HTTP return code */ msg_Dbg( p_input, "http: server='%s' port=%d file='%s", p_sys->url.psz_host, p_sys->url.i_port, p_sys->url.psz_path );
i_code = atoi( (char*)psz_parser ); if( p_sys->b_proxy )
msg_Dbg( p_input, "%s server replied: %i",
i_protocol == HTTP_PROTOCOL ? "HTTP" : "ICY", i_code );
psz_parser += 4;
i_size -= 4;
/* Find the end of the line */
for ( i = 0; (i < i_size -1) && ((psz_parser[i] != '\r') ||
(psz_parser[i+1] != '\n')); i++ )
{ {
; msg_Dbg( p_input, " proxy %s:%d", p_sys->proxy.psz_host, p_sys->proxy.i_port );
} }
if( p_sys->psz_user && *p_sys->psz_user )
/* Check we actually parsed something */
if ( i+1 == i_size && psz_parser[i+1] != '\n' )
{ {
msg_Err( p_input, "stream not compliant with HTTP/1.x" ); msg_Dbg( p_input, " user='%s', pwd='%s'", p_sys->psz_user, p_sys->psz_passwd );
return VLC_EGENERIC;
} }
/* Store the line we just parsed and skip it */ /* Connect */
psz_answer = strndup( psz_parser, i ); if( Connect( p_input, &p_input->stream.b_seekable, &p_input->stream.p_selected_area->i_size, 0 ) )
if( !psz_answer )
{ {
return VLC_ENOMEM; /* Retry with http 1.0 */
} p_sys->i_version = 0;
p_input->p_current_data = psz_parser + i + 2; if( Connect( p_input, &p_input->stream.b_seekable, &p_input->stream.p_selected_area->i_size, 0 ) )
{
goto error;
}
}
/* Parse remaining headers */ if( ( p_sys->i_code == 301 || p_sys->i_code == 302 || p_sys->i_code == 303 || p_sys->i_code == 307 ) &&
for ( ; ; ) p_sys->psz_location && *p_sys->psz_location )
{ {
char psz_line[MAX_ANSWER_SIZE]; msg_Dbg( p_input, "redirection to %s", p_sys->psz_location );
i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE );
psz_parser = (char *)p_bytes;
if( i_size <= 0 ) playlist_t * p_playlist = (playlist_t *)vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
if( !p_playlist )
{ {
msg_Err( p_input, "not enough data" ); msg_Err( p_input, "redirection failed: can't find playlist" );
Close( VLC_OBJECT(p_input) ); goto error;
free( psz_answer );
return VLC_EGENERIC;
} }
p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
playlist_Add( p_playlist, p_sys->psz_location, p_sys->psz_location,
PLAYLIST_INSERT | PLAYLIST_GO,
p_playlist->i_index + 1 );
vlc_object_release( p_playlist );
/* Copy one line to psz_line */ p_sys->i_size = 0; /* Force to stop reading */
i = 0; }
while( i_size && psz_parser[i] != '\r'
&& psz_parser[i + 1] != '\n' ) /* Finish to set up p_input */
{ p_input->pf_read = Read;
psz_line[i] = psz_parser[i]; p_input->pf_set_program = input_SetProgram;
i++; p_input->pf_set_area = NULL;
i_size--; p_input->pf_seek = Seek;
}
p_input->p_current_data = psz_parser + i + 2; vlc_mutex_lock( &p_input->stream.stream_lock );
if( !i ) p_input->stream.b_pace_control = VLC_TRUE;
{ p_input->stream.p_selected_area->i_tell = 0;
break; /* End of headers */ p_input->stream.i_method = INPUT_METHOD_NETWORK;
} vlc_mutex_unlock( &p_input->stream.stream_lock );
psz_line[i] = '\0'; p_input->i_mtu = 0;
psz_parser = strchr( psz_line, ':' ); if( !strcmp( p_sys->psz_protocol, "ICY" ) &&
if ( !psz_parser ) ( !p_input->psz_demux || !*p_input->psz_demux ) )
{
if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) )
{ {
msg_Err( p_input, "malformed header line: %s", psz_line ); p_input->psz_demux = strdup( "nsv" );
free( psz_answer );
return VLC_EGENERIC;
} }
psz_parser[0] = '\0'; else
psz_parser++;
while ( *psz_parser == ' ' || *psz_parser == '\t' )
{ {
psz_parser++; p_input->psz_demux = strdup( "mp3" );
} }
psz_value = psz_parser; msg_Info( p_input, "ICY server found, %s demuxer selected", p_input->psz_demux );
}
if( !strcasecmp( psz_line, "Content-Length" ) )
{
off_t i_size = 0;
i_size = i_tell + atoll( psz_value ); /* Update default_pts to a suitable value for http access */
msg_Dbg( p_input, "stream size is "I64Fd, i_size ); 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;
vlc_mutex_lock( &p_input->stream.stream_lock ); return VLC_SUCCESS;
p_input->stream.p_selected_area->i_size = i_size;
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
/* Redirection support */
else if( ( i_code == 301 || i_code == 302 ||
i_code == 303 || i_code == 307 )
&& !strcasecmp( psz_line, "location" ) )
{
playlist_t * p_playlist = (playlist_t *) vlc_object_find(
p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
if( !p_playlist )
{
msg_Err( p_input, "redirection failed: can't find playlist" );
free( psz_answer );
return VLC_EGENERIC;
}
msg_Dbg( p_input, "%i %s: redirected to %s",
i_code, psz_answer, psz_value );
p_playlist->pp_items[p_playlist->i_index]->b_autodeletion
= VLC_TRUE;
playlist_Add( p_playlist, psz_value, psz_value,
PLAYLIST_INSERT | PLAYLIST_GO,
p_playlist->i_index + 1 );
vlc_object_release( p_playlist );
}
/* TODO: parse other headers here */ 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_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 );
/* Something went wrong */ if( p_sys->fd > 0 )
if ( i_code >= 400 )
{ {
msg_Err( p_input, "%i %s", i_code, psz_answer ); net_Close( p_sys->fd );
p_input->p_current_data = psz_parser + i_size;
free( psz_answer );
return VLC_EGENERIC;
} }
free( p_sys );
return VLC_EGENERIC;
}
free( psz_answer ); /*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t*)p_this;
access_sys_t *p_sys = p_input->p_access_data;
/* Set final stream properties */ vlc_UrlClean( &p_sys->url );
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_UrlClean( &p_sys->proxy );
if( i_protocol == ICY_PROTOCOL )
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_location ) free( p_sys->psz_location );
if( p_sys->psz_user_agent ) free( p_sys->psz_user_agent );
if( p_sys->fd > 0 )
{ {
p_input->stream.b_seekable = VLC_FALSE; net_Close( p_sys->fd );
} }
else free( p_sys );
}
/*****************************************************************************
* Seek: close and re-open a connection at the right place
*****************************************************************************/
static void Seek( input_thread_t * p_input, off_t i_pos )
{
access_sys_t *p_sys = p_input->p_access_data;
msg_Dbg( p_input, "trying to seek to "I64Fd, i_pos );
net_Close( p_sys->fd ); p_sys->fd = -1;
if( Connect( p_input, &p_input->stream.b_seekable, &p_input->stream.p_selected_area->i_size, i_pos ) )
{ {
p_input->stream.b_seekable = VLC_TRUE; msg_Err( p_input, "seek failed" );
} }
if( p_input->stream.p_selected_area->i_size ) vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.p_selected_area->i_tell = i_pos;
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
/*****************************************************************************
* Read: Read up to i_len bytes from the http connection and place in
* p_buffer. Return the actual number of bytes read
*****************************************************************************/
static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_input->p_access_data;
int i_read;
if( p_sys->fd < 0 )
{ {
p_input->stream.p_selected_area->i_tell = i_tell; return -1;
} }
else if( p_sys->i_size > 0 && i_len + p_sys->i_tell > p_sys->i_size )
{ {
p_input->stream.b_seekable = VLC_FALSE; if( ( i_len = p_sys->i_size - p_sys->i_tell ) == 0 )
{
return 0;
}
} }
if( i_code != 206 )
i_read = net_Read( p_input, p_sys->fd, p_buffer, i_len, VLC_FALSE );
if( i_read > 0 )
{ {
p_input->stream.b_seekable = VLC_FALSE; p_sys->i_tell += i_read;
} }
p_input->stream.b_changed = VLC_TRUE; return i_read;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
* Encode a string in base64 * ParseURL: extract user:password
* Code borrowed from Rafael Steil
*****************************************************************************/ *****************************************************************************/
void encodeblock( unsigned char in[3], unsigned char out[4], int len ) static void ParseURL( access_sys_t *p_sys, char *psz_url )
{ {
static const char cb64[] char *psz_dup = strdup( psz_url );
= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; char *p = psz_dup;
out[0] = cb64[ in[0] >> 2 ]; char *psz;
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 *psz_str, input_thread_t *p_input ) /* Syntax //[user:password]@<hostname>[:<port>][/<path>] */
{ while( *p == '/' )
unsigned char in[3], out[4];
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" ); p++;
return NULL;
} }
psz = p;
while( *psz_tmp ) /* Parse auth */
if( ( p = strchr( psz, '@' ) ) )
{ {
len = 0; *p++ = '\0';
char *comma = strchr( psz, ':' );
for( i = 0; i < 3; i++ ) /* Retreive user:password */
if( comma )
{ {
in[i] = (unsigned char)*psz_tmp; *comma++ = '\0';
if (*psz_tmp) p_sys->psz_user = strdup( psz );
len++; p_sys->psz_passwd = strdup( comma );
else
in[i] = 0;
psz_tmp++;
} }
else
if( len )
{ {
encodeblock( in, out, len ); p_sys->psz_user = strdup( psz );
for( i = 0; i < 4; i++ )
{
psz_result[blocksout++] = out[i];
}
} }
} }
else
{
p = psz;
}
/* Parse uri */
vlc_UrlParse( &p_sys->url, p, 0 );
psz_result[blocksout] = '\0'; free( psz_dup );
return psz_result;
} }
/***************************************************************************** /*****************************************************************************
* Open: parse URL and open the remote file at the beginning * Connect:
*****************************************************************************/ *****************************************************************************/
static int Open( vlc_object_t *p_this ) static int Connect( input_thread_t *p_input, vlc_bool_t *pb_seekable, off_t *pi_size, off_t i_tell )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; access_sys_t *p_sys = p_input->p_access_data;
_input_socket_t * p_access_data; vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url;
char * psz_name = strdup(p_input->psz_name); char *psz;
char * psz_parser = psz_name, * psz_auth_parser;
char * psz_server_addr = "";
char * psz_server_port = "";
char * psz_path = "";
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) ); /* Clean info */
p_input->p_access_data = (access_sys_t *)p_access_data; if( p_sys->psz_location ) free( p_sys->psz_location );
if( p_access_data == NULL ) if( p_sys->psz_mime ) free( p_sys->psz_mime );
p_sys->psz_location = NULL;
p_sys->psz_mime = NULL;
p_sys->i_size = -1;
p_sys->i_tell = i_tell;
/* Open connection */
p_sys->fd = net_OpenTCP( p_input, srv.psz_host, srv.i_port );
if( p_sys->fd < 0 )
{ {
msg_Err( p_input, "out of memory" ); msg_Err( p_input, "cannot connect to %s:%d", srv.psz_host, srv.i_port );
free(psz_name); return VLC_EGENERIC;
return VLC_ENOMEM;
} }
p_access_data->psz_name = psz_name; if( p_sys->b_proxy )
p_access_data->psz_network = "";
memset(p_access_data->psz_auth_string, 0, MAX_QUERY_SIZE);
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"; net_Printf( VLC_OBJECT(p_input), p_sys->fd,
"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 );
} }
var_Create( p_input, "ipv6", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); else
var_Get( p_input, "ipv6", &val );
if( val.i_int )
{ {
p_access_data->psz_network = "ipv6"; net_Printf( VLC_OBJECT(p_input), p_sys->fd,
"GET %s HTTP/1.%d\r\n"
"Host: %s\r\n",
p_sys->url.psz_path, p_sys->i_version, p_sys->url.psz_host );
} }
if( *p_input->psz_access ) /* User Agent */
net_Printf( VLC_OBJECT(p_input), p_sys->fd, "User-Agent: %s\r\n", p_sys->psz_user_agent );
/* Offset */
if( p_sys->i_version == 1 )
{ {
/* Find out which shortcut was used */ net_Printf( VLC_OBJECT(p_input), p_sys->fd,
if( !strncmp( p_input->psz_access, "http6", 6 ) ) "Range: bytes="I64Fd"-\r\n", i_tell );
{
p_access_data->psz_network = "ipv6";
}
else if( !strncmp( p_input->psz_access, "http4", 6 ) )
{
p_access_data->psz_network = "ipv4";
}
} }
/* Authentification */
if( p_sys->psz_user && *p_sys->psz_user )
{
char buf[strlen(p_sys->psz_user ) + 1 + strlen( p_sys->psz_passwd ? p_sys->psz_passwd : "" ) + 1];
char *b64;
sprintf( buf, "%s:%s", p_sys->psz_user, p_sys->psz_passwd ? p_sys->psz_passwd : "" );
/* Parse psz_name syntax : b64 = b64_encode( buf );
* //[user:password]@<hostname>[:<port>][/<path>] */
while( *psz_parser == '/' ) net_Printf( VLC_OBJECT(p_input), p_sys->fd, "Authorization: Basic %s", b64 );
{ free( b64 );
psz_parser++;
} }
psz_auth_parser = psz_parser; net_Printf( VLC_OBJECT(p_input), p_sys->fd, "Connection: Close\r\n" );
while ( *psz_auth_parser != '@' && *psz_auth_parser != '\0' ) if( net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ) < 0 )
{
psz_auth_parser++;
}
if ( *psz_auth_parser == '@' )
{ {
psz_user = psz_parser; msg_Err( p_input, "Failed to send request\n" );
while ( *psz_parser != ':' && psz_parser < psz_auth_parser ) net_Close( p_sys->fd ); p_sys->fd = -1;
{ return VLC_EGENERIC;
psz_parser++;
}
if ( psz_parser != psz_auth_parser )
{
*psz_parser = '\0';
psz_pwd = psz_parser + 1;
}
else
{
psz_pwd = "";
}
*psz_auth_parser = '\0';
psz_parser = psz_auth_parser + 1;
} }
psz_server_addr = psz_parser; /* Set values */
*pb_seekable = p_sys->i_version == 1 ? VLC_TRUE : VLC_FALSE;
*pi_size = 0;
while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) /* Read Answer */
if( ( psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ) ) == NULL )
{ {
if( *psz_parser == '[' ) msg_Err( p_input, "Failed to read answer\n" );
{ goto error;
/* IPv6 address */
while( *psz_parser && *psz_parser != ']' )
{
psz_parser++;
}
}
psz_parser++;
} }
if( !strncmp( psz, "HTTP/1.", 7 ) )
if ( *psz_parser == ':' )
{ {
*psz_parser = '\0'; p_sys->psz_protocol = "HTTP";
psz_parser++; p_sys->i_code = atoi( &psz[9] );
psz_server_port = psz_parser;
while( *psz_parser && *psz_parser != '/' )
{
psz_parser++;
}
} }
else if( !strncmp( psz, "ICY", 3 ) )
if( *psz_parser == '/' )
{ {
*psz_parser = '\0'; p_sys->psz_protocol = "ICY";
psz_parser++; p_sys->i_code = atoi( &psz[4] );
psz_path = psz_parser;
} }
else
/* Convert port format */
if( *psz_server_port )
{ {
i_server_port = strtol( psz_server_port, &psz_parser, 10 ); msg_Err( p_input, "invalid HTTP reply '%s'", psz );
if( *psz_parser ) free( psz );
{ goto error;
msg_Err( p_input, "cannot parse server port near %s", psz_parser );
free( p_input->p_access_data );
free( psz_name );
return VLC_EGENERIC;
}
} }
msg_Dbg( p_input, "Protocol '%s' answer code %d", p_sys->psz_protocol, p_sys->i_code );
if( i_server_port == 0 ) if( !strcmp( p_sys->psz_protocol, "ICY" ) )
{ {
i_server_port = 80; *pb_seekable = VLC_FALSE;
} }
if( p_sys->i_code != 206 )
if( !*psz_server_addr )
{ {
msg_Err( p_input, "no server given" ); *pb_seekable = VLC_FALSE;
free( p_input->p_access_data );
free( psz_name );
return VLC_EGENERIC;
} }
if( p_sys->i_code >= 400 )
/* Handle autehtification */
if ( !psz_user )
{ {
var_Create( p_input, "http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); msg_Err( p_input, "error: %s", psz );
var_Get( p_input, "http-user", &val ); free( psz );
psz_user = val.psz_string; goto error;
var_Create( p_input, "http-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_input, "http-pwd", &val );
psz_pwd = val.psz_string;
} }
free( psz );
if ( *psz_user ) for( ;; )
{ {
char psz_user_pwd[MAX_QUERY_SIZE]; char *psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd );
msg_Dbg( p_input, "authenticating, user=%s, password=%s", char *p;
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 ) );
}
/* Check proxy config variable */ if( psz == NULL )
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 */
psz_proxy_orig = getenv( "http_proxy" );
if( psz_proxy_orig != NULL )
{ {
psz_proxy_orig = strdup( psz_proxy_orig ); msg_Err( p_input, "Failed to read answer\n" );
goto error;
} }
}
psz_proxy = psz_proxy_orig; msg_Dbg( p_input, "Line=%s", psz );
if( psz_proxy != NULL && *psz_proxy ) if( *psz == '\0' )
{
/* http://myproxy.mydomain:myport/ */
int i_proxy_port = 0;
/* Skip the protocol name */
while( *psz_proxy && *psz_proxy != ':' )
{ {
psz_proxy++; free( psz );
break;
} }
/* Skip the "://" part */
while( *psz_proxy && (*psz_proxy == ':' || *psz_proxy == '/') ) if( ( p = strchr( psz, ':' ) ) == NULL )
{ {
psz_proxy++; msg_Err( p_input, "malformed header line: %s", psz );
free( psz );
goto error;
} }
*p++ = '\0';
/* Found a proxy name */ if( !strcasecmp( psz, "Content-Length" ) )
if( *psz_proxy )
{ {
char *psz_port = psz_proxy; *pi_size = p_sys->i_size = i_tell + atoll( p );
msg_Dbg( p_input, "stream size="I64Fd, p_sys->i_size );
/* Skip the hostname part */
while( *psz_port && *psz_port != ':' && *psz_port != '/' )
{
psz_port++;
}
/* Found a port name */
if( *psz_port )
{
char * psz_junk;
/* Replace ':' with '\0' */
*psz_port = '\0';
psz_port++;
psz_junk = psz_port;
while( *psz_junk && *psz_junk != '/' )
{
psz_junk++;
}
if( *psz_junk )
{
*psz_junk = '\0';
}
if( *psz_port != '\0' )
{
i_proxy_port = atoi( psz_port );
}
}
psz_proxy = strdup( psz_proxy );
msg_Dbg( p_input, "using HTTP proxy server=%s port=%d",
psz_proxy, i_proxy_port );
} }
else else if( !strcasecmp( psz, "Location" ) )
{ {
msg_Err( p_input, "HTTP proxy %s is invalid!", psz_proxy_orig ); if( p_sys->psz_location ) free( p_sys->psz_location );
free( p_input->p_access_data ); p_sys->psz_location = strdup( p );
free( psz_name );
if( psz_proxy_orig ) free( psz_proxy_orig );
return VLC_EGENERIC;
} }
else if( !strcasecmp( psz, "Content-Type" ) )
if( psz_proxy_orig ) free( psz_proxy_orig );
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",
psz_server_addr, i_server_port, psz_path );
}
else
{
/* No proxy, direct connection. */
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",
psz_path, psz_server_addr );
}
p_access_data->psz_buffer[MAX_QUERY_SIZE - 1] = '\0';
msg_Dbg( p_input, "opening server=%s port=%d path=%s",
psz_server_addr, i_server_port, psz_path );
p_input->pf_read = Read;
p_input->pf_set_program = input_SetProgram;
p_input->pf_set_area = NULL;
p_input->pf_seek = Seek;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_pace_control = VLC_TRUE;
p_input->stream.b_seekable = VLC_TRUE;
p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.p_selected_area->i_size = 0;
p_input->stream.i_method = INPUT_METHOD_NETWORK;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_input->i_mtu = 0;
if( HTTPConnect( p_input, 0 ) )
{
/* Request failed, try again with HTTP/1.0 */
char * psz_pos = strstr( p_access_data->psz_buffer, "HTTP/1.1" );
if( !psz_pos )
{ {
return VLC_EGENERIC; if( p_sys->psz_mime ) free( p_sys->psz_mime );
p_sys->psz_mime = strdup( p );
} }
p_input->stream.b_seekable = VLC_FALSE; free( psz );
psz_pos[7] = '0';
if( HTTPConnect( p_input, 0 ) )
{
free( p_input->p_access_data );
free( psz_name );
return VLC_EGENERIC;
}
} }
/* Update default_pts to a suitable value for http access */
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; return VLC_SUCCESS;
}
/***************************************************************************** error:
* Close: free unused data structures net_Close( p_sys->fd ); p_sys->fd = -1;
*****************************************************************************/ return VLC_EGENERIC;
static void Close( vlc_object_t *p_this )
{
input_thread_t * p_input = (input_thread_t *)p_this;
int i_handle = ((network_socket_t *)p_input->p_access_data)->i_handle;
_input_socket_t * p_access_data =
(_input_socket_t *)p_input->p_access_data;
free( p_access_data->psz_name );
msg_Info( p_input, "closing HTTP target `%s'", p_input->psz_source );
#if defined( WIN32 ) || defined( UNDER_CE )
closesocket( i_handle );
#else
close( i_handle );
#endif
free( p_access_data );
} }
/***************************************************************************** /*****************************************************************************
* Seek: close and re-open a connection at the right place * b64_encode:
*****************************************************************************/ *****************************************************************************/
static void Seek( input_thread_t * p_input, off_t i_pos ) static char *b64_encode( unsigned char *src )
{ {
_input_socket_t *p_access_data = (_input_socket_t*)p_input->p_access_data; static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
#if defined( WIN32 ) || defined( UNDER_CE )
closesocket( p_access_data->_socket.i_handle );
#else
close( p_access_data->_socket.i_handle );
#endif
msg_Dbg( p_input, "seeking to position "I64Fd, i_pos );
HTTPConnect( p_input, i_pos );
}
/***************************************************************************** char *dst = malloc( strlen( src ) * 4 / 3 + 12 );
* Read: Read up to i_len bytes from the http connection and place in char *ret = dst;
* p_buffer. Return the actual number of bytes read unsigned i_bits = 0;
*****************************************************************************/ unsigned i_shift = 0;
static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
{ for( ;; )
input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data; {
struct timeval timeout; if( *src )
fd_set fds;
ssize_t i_recv;
int i_ret;
/* Initialize file descriptor set */
FD_ZERO( &fds );
FD_SET( p_access_data->i_handle, &fds );
/* We'll wait 0.5 second if nothing happens */
timeout.tv_sec = 0;
timeout.tv_usec = 500000;
/* Find if some data is available */
while( (i_ret = select( p_access_data->i_handle + 1, &fds,
NULL, NULL, &timeout )) == 0
#ifdef HAVE_ERRNO_H
|| (i_ret < 0 && errno == EINTR)
#endif
)
{
FD_ZERO( &fds );
FD_SET( p_access_data->i_handle, &fds );
timeout.tv_sec = 0;
timeout.tv_usec = 500000;
if( p_input->b_die || p_input->b_error )
{ {
return 0; i_bits = ( i_bits << 8 )|( *src++ );
i_shift += 8;
}
else if( i_shift > 0 )
{
i_bits <<= 6 - i_shift;
i_shift = 6;
}
else
{
*dst++ = '=';
break;
} }
}
if( i_ret < 0 ) while( i_shift >= 6 )
{ {
msg_Err( p_input, "network select error" ); i_shift -= 6;
return -1; *dst++ = b64[(i_bits >> i_shift)&0x3f];
}
} }
i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 ); *dst++ = '\0';
if( i_recv < 0 )
{
#ifdef HAVE_ERRNO_H
msg_Err( p_input, "recv failed (%s)", strerror(errno) );
#else
msg_Err( p_input, "recv failed" );
#endif
}
return i_recv; return ret;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment