Skip to content

V
vlc-2-2
Commit ee0a2449 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/access/http.c: code clean-up. removed sizeof()-1 calls where we 

    meant strlen(), removed useless strcmp() calls, implemented atoll() for
    systems where it does not exist, fixed a memory leak, fixed a minor data
    corruption.
parent d8120484
Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 136 deletions
modules/access/http.c
View file @ ee0a2449
......@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.14 2002/12/06 12:18:11 sigmunau Exp $
* $Id: http.c,v 1.15 2002/12/06 12:54:30 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -28,7 +28,6 @@
#include <string.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc_playlist.h>
#ifdef HAVE_ERRNO_H
# include <errno.h>
......@@ -55,6 +54,7 @@
# include <sys/socket.h>
#endif
#include "vlc_playlist.h"
#include "network.h"
/*****************************************************************************
......@@ -70,9 +70,12 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define PROXY_TEXT N_("Use an http proxy")
#define PROXY_TEXT N_("specify an HTTP proxy")
#define PROXY_LONGTEXT N_( \
"The htpp proxy must be in the form http://myproxy.mydomain:myport" )
"Specify an HTTP proxy to use. It must be in the form " \
"http://myproxy.mydomain:myport . If none is specified, the HTTP_PROXY" \
"environment variable will be tried." )
vlc_module_begin();
add_category_hint( N_("http"), NULL );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT );
......@@ -88,34 +91,31 @@ vlc_module_end();
* _input_socket_t: private access plug-in data, modified to add private
* fields
*****************************************************************************/
#define MAX_ANSWER_SIZE 1024
#define MAX_QUERY_SIZE 1024
typedef struct _input_socket_s
{
input_socket_t _socket;
char * psz_network;
network_socket_t socket_desc;
char psz_buffer[256];
char psz_buffer[MAX_QUERY_SIZE];
char * psz_name;
} _input_socket_t;
#define MAX_LINE 1024
/*****************************************************************************
* HTTPConnect: connect to the server and seek to i_tell
*****************************************************************************/
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_buffer[1024];
byte_t * psz_parser;
int i_pos, i_returncode, i, i_size;
char * psz_return_alpha;
char * psz_protocol;
char psz_line[MAX_LINE];
char * psz_header_name;
char * psz_header_value;
playlist_t * p_playlist;
char * psz_parser, * psz_value, * psz_answer;
int i_code, i_ret, i, i_size;
enum { HTTP_PROTOCOL, ICY_PROTOCOL } i_protocol;
/* Find an appropriate network module */
p_access_data = (_input_socket_t *)p_input->p_access_data;
......@@ -132,9 +132,10 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
# define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n"
# define HTTP_END "\r\n"
/* Build the query string */
if ( p_input->stream.b_seekable )
{
snprintf( psz_buffer, sizeof(psz_buffer),
snprintf( psz_buffer, MAX_QUERY_SIZE,
"%s"
"Range: bytes="I64Fd"-\r\n"
HTTP_USERAGENT HTTP_END,
......@@ -142,16 +143,17 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
}
else
{
snprintf( psz_buffer, sizeof(psz_buffer),
snprintf( psz_buffer, MAX_QUERY_SIZE,
"%s"
HTTP_USERAGENT HTTP_END,
p_access_data->psz_buffer );
}
psz_buffer[sizeof(psz_buffer) - 1] = '\0';
printf(psz_buffer);
/* Send GET ... */
if( send( p_access_data->_socket.i_handle, psz_buffer,
strlen( psz_buffer ), 0 ) == (-1) )
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) );
......@@ -178,165 +180,184 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
}
}
/* Parse HTTP header. */
/* Get the HTTP returncode */
i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE );
/* get the returncode */
if( (i_size = input_Peek( p_input, &psz_parser, MAX_LINE )) <= 0 )
if( i_size <= 0 )
{
msg_Err( p_input, "not enough data" );
Close( VLC_OBJECT(p_input) );
return VLC_EGENERIC;
}
if( ( ( i_size >= sizeof("HTTP/1.") + 1 ) &&
/* Guess the protocol */
if( ( ( (size_t)i_size >= strlen("HTTP/1.x") ) &&
!strncmp( psz_parser, "HTTP/1.", strlen("HTTP/1.") ) ) )
{
psz_protocol = "HTTP";
i_protocol = HTTP_PROTOCOL;
psz_parser += strlen("HTTP/1.x");
i_size -= strlen("HTTP/1.x");
}
else if( ( i_size >= sizeof("ICY") &&
!strncmp( psz_parser, "ICY", sizeof("ICY") - 1 ) ) )
else if( ( (size_t)i_size >= strlen("ICY") &&
!strncmp( psz_parser, "ICY", strlen("ICY") ) ) )
{
psz_protocol = "ICY";
i_protocol = ICY_PROTOCOL;
if( !p_input->psz_demux || !*p_input->psz_demux )
{
msg_Info( p_input, "ICY server --> mp3 demuxer selected" );
msg_Info( p_input, "ICY server found, mp3 demuxer selected" );
p_input->psz_demux = "mp3"; // FIXME strdup ?
}
psz_parser += strlen("ICY");
i_size -= strlen("ICY");
}
else
{
msg_Err( p_input, "invalid http reply" );
msg_Err( p_input, "invalid HTTP reply '%s'", psz_parser );
return VLC_EGENERIC;
}
msg_Dbg( p_input, "detected %s server", psz_protocol );
if( !strncmp( psz_protocol, "ICY", sizeof("ICY") - 1 ) )
{ // ICY server
psz_parser += (sizeof("ICY") - 1);
i_size -= (sizeof("ICY") - 1);
}
else
{ // HTTP/1.0 or HTTP/1.1
psz_parser += sizeof("HTTP/1.") + 1;
i_size -= sizeof("HTTP/1.") + 1;
}
i_returncode = atoi( (char*)psz_parser );
msg_Dbg( p_input, "%s server replied: %i", psz_protocol, i_returncode );
/* Check the HTTP return code */
i_code = atoi( (char*)psz_parser );
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++ )
{
;
}
/* check we actually parsed something */
if ( (i == i_size - 1) && (psz_parser[i+1] != '\n') )
/* 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" );
return VLC_EGENERIC;
}
psz_return_alpha = malloc( i + 1 );
memcpy( psz_return_alpha, psz_parser, i );
psz_return_alpha[i] = '\0';
p_input->p_current_data = &psz_parser[i + 2];
/* Store the line we just parsed and skip it */
psz_answer = strndup( psz_parser, i );
if( !psz_answer )
{
return VLC_ENOMEM;
}
p_input->p_current_data = psz_parser + i + 2;
/* read header lines */
/* Parse remaining headers */
for ( ; ; )
{
if( ( i_size = input_Peek( p_input, &psz_parser, MAX_LINE ) ) <= 0 )
char psz_line[MAX_ANSWER_SIZE];
i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE );
if( i_size <= 0 )
{
msg_Err( p_input, "not enough data" );
Close( VLC_OBJECT(p_input) );
free( psz_answer );
return VLC_EGENERIC;
}
i_pos = 0;
while( i_size && psz_parser[i_pos] != '\r'
&& psz_parser[i_pos + 1] != '\n' )
/* Copy one line to psz_line */
i = 0;
while( i_size && psz_parser[i] != '\r'
&& psz_parser[i + 1] != '\n' )
{
psz_line[i_pos] = psz_parser[i_pos];
i_pos++;
psz_line[i] = psz_parser[i];
i++;
i_size--;
}
p_input->p_current_data = &psz_parser[i_pos + 2];
if (!i_pos)
p_input->p_current_data = psz_parser + i + 2;
if( !i )
{
break; /* end of header*/
break; /* End of headers */
}
psz_line[i_pos] = '\0';
psz_line[i] = '\0';
psz_parser = strchr( psz_line, ':' );
if ( !psz_parser )
{
msg_Err( p_input, "malformed header line: %s", psz_line );
free( psz_answer );
return VLC_EGENERIC;
}
*psz_parser = '\0';
psz_parser[0] = '\0';
psz_parser++;
psz_header_name = psz_line;
while ( *psz_parser == ' ' || *psz_parser == '\t' )
{
psz_parser++;
}
psz_header_value = psz_parser;
/* msg_Dbg( p_input, "found header \"%s: %s\"",
psz_header_name, psz_header_value );*/
psz_value = psz_parser;
if( !strcasecmp( psz_header_name, "Content-Length" ) )
if( !strcasecmp( psz_line, "Content-Length" ) )
{
vlc_mutex_lock( &p_input->stream.stream_lock );
off_t i_size = 0;
#ifdef HAVE_ATOLL
p_input->stream.p_selected_area->i_size = atoll( (char*)psz_header_value )
+ i_tell;
i_size = i_tell + atoll( psz_value );
#else
/* FIXME : this won't work for 64-bit lengths */
p_input->stream.p_selected_area->i_size = atoi( (char*)psz_header_value )
+ i_tell;
psz_parser = psz_value;
while( psz_parser[0] >= '0' && psz_parser[0] <= '9' )
{
i_size *= 10;
i_size += psz_parser[0] - '0';
}
i_size += i_tell;
#endif
msg_Dbg( p_input, "stream size is %d", p_input->stream.p_selected_area->i_size );
msg_Dbg( p_input, "stream size is "I64Fd, i_size );
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.p_selected_area->i_size = i_size;
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
/* redirection support */
else if ( ( i_returncode == 301 ||
i_returncode == 302 ||
i_returncode == 303 ||
i_returncode == 307 )
&& !strcasecmp( psz_header_name, "location" ) )
/* Redirection support */
else if( ( i_code == 301 || i_code == 302 ||
i_code == 303 || i_code == 307 )
&& !strcasecmp( psz_line, "location" ) )
{
p_playlist = (playlist_t *) vlc_object_find( p_input,
VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
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: redircted to %s",
i_returncode, psz_return_alpha, psz_header_value );
p_playlist->pp_items[p_playlist->i_index]->b_autodeletion =
VLC_TRUE;
playlist_Add( p_playlist, psz_header_value,
PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END );
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,
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
vlc_object_release( p_playlist );
}
/* parse other headers here */
/* TODO: parse other headers here */
}
if ( i_returncode >= 400 ) /* something is wrong */
/* Something went wrong */
if ( i_code >= 400 )
{
msg_Err( p_input, "%i %s", i_returncode, psz_return_alpha );
msg_Err( p_input, "%i %s", i_code, psz_answer );
p_input->p_current_data = psz_parser + i_size;
free( psz_answer );
return VLC_EGENERIC;
}
free( psz_answer );
/* Set final stream properties */
vlc_mutex_lock( &p_input->stream.stream_lock );
if( !strcmp( psz_protocol, "ICY") )
if( i_protocol == ICY_PROTOCOL )
{
p_input->stream.b_seekable = 0;
p_input->stream.b_seekable = VLC_FALSE;
}
else
{
p_input->stream.b_seekable = 1;
p_input->stream.b_seekable = VLC_TRUE;
}
if( p_input->stream.p_selected_area->i_size )
......@@ -346,9 +367,9 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
}
else
{
p_input->stream.b_seekable = 0;
p_input->stream.b_seekable = VLC_FALSE;
}
p_input->stream.b_changed = 1;
p_input->stream.b_changed = VLC_TRUE;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return VLC_SUCCESS;
......@@ -375,7 +396,7 @@ static int Open( vlc_object_t *p_this )
{
msg_Err( p_input, "out of memory" );
free(psz_name);
return( -1 );
return VLC_ENOMEM;
}
p_access_data->psz_name = psz_name;
......@@ -442,7 +463,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_input, "cannot parse server port near %s", psz_parser );
free( p_input->p_access_data );
free( psz_name );
return( -1 );
return VLC_EGENERIC;
}
}
......@@ -456,14 +477,20 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_input, "no server given" );
free( p_input->p_access_data );
free( psz_name );
return( -1 );
return VLC_EGENERIC;
}
/* Check proxy config variable */
if( (psz_proxy_orig = config_GetPsz( p_input, "http-proxy" )) == NULL )
psz_proxy_orig = config_GetPsz( p_input, "http-proxy" );
if( psz_proxy_orig == NULL )
{
/* Check proxy environment variable */
if( (psz_proxy_orig = getenv( "http_proxy" )) != NULL )
psz_proxy_orig = getenv( "http_proxy" );
if( psz_proxy_orig != NULL )
{
psz_proxy_orig = strdup( psz_proxy_orig );
}
}
psz_proxy = psz_proxy_orig;
if( psz_proxy != NULL && *psz_proxy )
......@@ -522,16 +549,16 @@ static int Open( vlc_object_t *p_this )
psz_proxy = strdup( psz_proxy );
msg_Dbg( p_input, "using http proxy server=%s port=%d",
msg_Dbg( p_input, "using HTTP proxy server=%s port=%d",
psz_proxy, i_proxy_port );
}
else
{
msg_Err( p_input, "http proxy %s is invalid!", psz_proxy_orig );
msg_Err( p_input, "HTTP proxy %s is invalid!", psz_proxy_orig );
free( p_input->p_access_data );
free( psz_name );
if( psz_proxy_orig ) free( psz_proxy_orig );
return( -1 );
return VLC_EGENERIC;
}
if( psz_proxy_orig ) free( psz_proxy_orig );
......@@ -540,7 +567,7 @@ static int Open( vlc_object_t *p_this )
p_access_data->socket_desc.i_server_port = i_proxy_port;
p_access_data->socket_desc.i_type = NETWORK_TCP;
snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer),
snprintf( p_access_data->psz_buffer, MAX_QUERY_SIZE,
"GET http://%s:%d/%s\r\n HTTP/1.0\r\n",
psz_server_addr, i_server_port, psz_path );
}
......@@ -551,11 +578,11 @@ static int Open( vlc_object_t *p_this )
p_access_data->socket_desc.psz_server_addr = psz_server_addr;
p_access_data->socket_desc.i_server_port = i_server_port;
snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer),
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[sizeof(p_access_data->psz_buffer) - 1] = '\0';
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 );
......@@ -566,8 +593,8 @@ static int Open( vlc_object_t *p_this )
p_input->pf_seek = Seek;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_pace_control = 1;
p_input->stream.b_seekable = 1;
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;
......@@ -584,7 +611,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
p_input->stream.b_seekable = 0;
p_input->stream.b_seekable = VLC_FALSE;
psz_pos[7] = '0';
if( HTTPConnect( p_input, 0 ) )
{
......@@ -626,7 +653,7 @@ static void Close( vlc_object_t *p_this )
static int SetProgram( input_thread_t * p_input,
pgrm_descriptor_t * p_program )
{
return( 0 );
return VLC_SUCCESS;
}
/*****************************************************************************
......@@ -696,6 +723,7 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
msg_Err( p_input, "recv failed" );
#endif
}
return i_recv;
}
......
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