* http.c : HTTP/HTTPS Remote control interface
*****************************************************************************
* Copyright (C) 2001-2006 the VideoLAN team
- * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
#define CRL_TEXT N_( "CRL file" )
#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." )
-vlc_module_begin();
- set_shortname( N_("HTTP"));
- set_description( N_("HTTP remote control interface") );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
- add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true );
- add_obsolete_string ( "http-charset" );
+vlc_module_begin ()
+ set_shortname( N_("HTTP"))
+ set_description( N_("HTTP remote control interface") )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
+ add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true )
+ add_obsolete_string ( "http-charset" )
#if defined( HAVE_FORK ) || defined( WIN32 )
- add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true );
+ add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
#endif
- add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true );
- set_section( N_("HTTP SSL" ), 0 );
- add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true );
- add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true );
- add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true );
- add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true );
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+ add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true )
+ set_section( N_("HTTP SSL" ), 0 )
+ add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true )
+ add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true )
+ add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true )
+ add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true )
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
char *psz_remote_addr, char *psz_remote_host,
uint8_t **pp_data, int *pi_data );
-/*****************************************************************************
- * Local functions
- *****************************************************************************/
-#if !defined(__APPLE__) && !defined(SYS_BEOS) && !defined(WIN32)
-static int DirectoryCheck( const char *psz_dir )
-{
- struct stat stat_info;
-
- if( ( utf8_stat( psz_dir, &stat_info ) == -1 )
- || !S_ISDIR( stat_info.st_mode ) )
- {
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
-#endif
-
-
/*****************************************************************************
* Activate: initialize and create stuff
*****************************************************************************/
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys;
char *psz_address;
- const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
+ char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
*psz_crl = NULL;
int i_port = 0;
char *psz_src = NULL;
psz_address = var_CreateGetNonEmptyString( p_intf, "http-host" );
if( psz_address != NULL )
{
- char *psz_parser = strchr( psz_address, ':' );
+ char *psz_parser = strrchr( psz_address, ':' );
if( psz_parser )
{
*psz_parser++ = '\0';
p_intf->p_sys = p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
{
+ free( psz_address );
return( VLC_ENOMEM );
}
- p_sys->p_playlist = pl_Yield( p_this );
+ p_sys->p_playlist = pl_Hold( p_this );
p_sys->p_input = NULL;
p_sys->p_vlm = NULL;
p_sys->psz_address = psz_address;
p_sys->p_httpd_host = httpd_TLSHostNew( VLC_OBJECT(p_intf), psz_address,
i_port, psz_cert, psz_key, psz_ca,
psz_crl );
+ free( psz_cert );
+ free( psz_key );
+ free( psz_ca );
+ free( psz_crl );
+
if( p_sys->p_httpd_host == NULL )
{
msg_Err( p_intf, "cannot listen on %s:%d", psz_address, i_port );
p_sys->i_files = 0;
p_sys->pp_files = NULL;
-#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
- if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL )
- {
- const char * psz_vlcpath = config_GetDataDir();
- psz_src = malloc( strlen(psz_vlcpath) + strlen("/http" ) + 1 );
- if( !psz_src ) return VLC_ENOMEM;
- sprintf( psz_src, "%s/http", psz_vlcpath );
- }
-#else
psz_src = config_GetPsz( p_intf, "http-src" );
-
if( ( psz_src == NULL ) || ( *psz_src == '\0' ) )
{
const char *data_path = config_GetDataDir ();
- char buf[strlen (data_path) + sizeof ("/http")];
- snprintf (buf, sizeof (buf), "%s/http", data_path);
-
- const char const* ppsz_paths[] = {
- "share/http",
- "../share/http",
- buf,
- NULL
- };
- unsigned i;
-
- free( psz_src );
- psz_src = NULL;
-
- for( i = 0; ppsz_paths[i] != NULL; i++ )
- if( !DirectoryCheck( ppsz_paths[i] ) )
- {
- psz_src = strdup( ppsz_paths[i] );
- break;
- }
+ if( asprintf( &psz_src, "%s" DIR_SEP "http", data_path ) == -1 )
+ psz_src = NULL;
}
-#endif
if( !psz_src || *psz_src == '\0' )
{
/* FIXME: we're leaking h */
httpd_handler_sys_t *h = malloc( sizeof( httpd_handler_sys_t ) );
if( !h )
- {
- msg_Err( p_intf, "not enough memory to allocate album art handler" );
goto failed;
- }
h->file.p_intf = p_intf;
h->file.file = NULL;
h->file.name = NULL;
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
-
int i;
+#ifdef ENABLE_VLM
if( p_sys->p_vlm )
- {
vlm_Delete( p_sys->p_vlm );
- }
+#endif
for( i = 0; i < p_sys->i_files; i++ )
{
if( p_sys->pp_files[i]->b_handler )
assert( p_sys->p_input == NULL );
/* FIXME: proper locking anyone? */
- p_sys->p_input = p_sys->p_playlist->p_input;
+ p_sys->p_input = playlist_CurrentInput( p_sys->p_playlist );
if( p_sys->p_input )
{
- vlc_object_yield( p_sys->p_input );
var_Get( p_sys->p_input, "position", &val);
sprintf( position, "%d" , (int)((val.f_float) * 100.0));
var_Get( p_sys->p_input, "time", &val);
{
state = "opening/connecting";
}
- else if( val.i_int == BUFFERING_S )
- {
- state = "buffering";
- }
else if( val.i_int == PAUSE_S )
{
state = "paused";
char *p_url = (char *)_p_url;
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
- char *p_in = (char *)p_in;
+ char *p_in = (char *)_p_in;
int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *p;
int i_env = 0;
if( i_request )
{
- psz_tmp = malloc( sizeof("QUERY_STRING=") + i_request );
- sprintf( psz_tmp, "QUERY_STRING=%s", p_request );
+ asprintf( &psz_tmp, "QUERY_STRING=%s", p_request );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
- psz_tmp = malloc( sizeof("REQUEST_URI=?") + strlen(p_url)
- + i_request );
- sprintf( psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
+ asprintf( &psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
else
{
- psz_tmp = malloc( sizeof("REQUEST_URI=") + strlen(p_url) );
- sprintf( psz_tmp, "REQUEST_URI=%s", p_url );
+ asprintf( &psz_tmp, "REQUEST_URI=%s", p_url );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
- psz_tmp = malloc( sizeof("SCRIPT_NAME=") + strlen(p_url) );
- sprintf( psz_tmp, "SCRIPT_NAME=%s", p_url );
+ asprintf( &psz_tmp, "SCRIPT_NAME=%s", p_url );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
#define p_sys p_args->file.p_intf->p_sys
- psz_tmp = malloc( sizeof("SERVER_NAME=") + strlen(p_sys->psz_address) );
- sprintf( psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
+ asprintf( &psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
- psz_tmp = malloc( sizeof("SERVER_PORT=") + 5 );
- sprintf( psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
+ asprintf( &psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
#undef p_sys
p = getenv( "PATH" );
if( p != NULL )
{
- psz_tmp = malloc( sizeof("PATH=") + strlen(p) );
- sprintf( psz_tmp, "PATH=%s", p );
+ asprintf( &psz_tmp, "PATH=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
p = getenv( "windir" );
if( p != NULL )
{
- psz_tmp = malloc( sizeof("SYSTEMROOT=") + strlen(p) );
- sprintf( psz_tmp, "SYSTEMROOT=%s", p );
+ asprintf( &psz_tmp, "SYSTEMROOT=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
#endif
if( psz_remote_addr != NULL && *psz_remote_addr )
{
- psz_tmp = malloc( sizeof("REMOTE_ADDR=") + strlen(psz_remote_addr) );
- sprintf( psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
+ asprintf( &psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
if( psz_remote_host != NULL && *psz_remote_host )
{
- psz_tmp = malloc( sizeof("REMOTE_HOST=") + strlen(psz_remote_host) );
- sprintf( psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
+ asprintf( &psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
if( end == NULL )
break;
*end = '\0';
- psz_tmp = malloc( sizeof("CONTENT_TYPE=") + strlen(p) );
- sprintf( psz_tmp, "CONTENT_TYPE=%s", p );
+ asprintf( &psz_tmp, "CONTENT_TYPE=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r';
}
if( end == NULL )
break;
*end = '\0';
- psz_tmp = malloc( sizeof("CONTENT_LENGTH=") + strlen(p) );
- sprintf( psz_tmp, "CONTENT_LENGTH=%s", p );
+ asprintf( &psz_tmp, "CONTENT_LENGTH=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r';
}
if( psz_file != NULL )
{
psz_file++;
- psz_tmp = malloc( sizeof("SCRIPT_FILENAME=") + strlen(psz_file) );
- sprintf( psz_tmp, "SCRIPT_FILENAME=%s", psz_file );
+ asprintf( &psz_tmp, "SCRIPT_FILENAME=%s", psz_file );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
TAB_APPEND( p_args->p_association->i_argc,
projects / vlc / blobdiff