/*****************************************************************************
* http.c
*****************************************************************************
- * Copyright (C) 2001-2003 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Jon Lech Johansen <jon@nanocrew.net>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "vlc_httpd.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-#define DEFAULT_PORT 8080
-#define DEFAULT_SSL_PORT 8443
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+#include <vlc_httpd.h>
/*****************************************************************************
* Module descriptor
#define SOUT_CFG_PREFIX "sout-http-"
#define USER_TEXT N_("Username")
-#define USER_LONGTEXT N_("Allows you to give a user name that will be " \
+#define USER_LONGTEXT N_("User name that will be " \
"requested to access the stream." )
#define PASS_TEXT N_("Password")
-#define PASS_LONGTEXT N_("Allows you to give a password that will be " \
+#define PASS_LONGTEXT N_("Password that will be " \
"requested to access the stream." )
#define MIME_TEXT N_("Mime")
-#define MIME_LONGTEXT N_("Allows you to give the mime returned by the server." )
-
-#define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\
- "be used by the HTTP/SSL stream output" )
-#define KEY_TEXT N_( "Private key file" )
-#define KEY_LONGTEXT N_( "Path to the x509 PEM private key file that will " \
- " be used by the HTTP/SSL stream output. Leave " \
- "empty if you don't have one." )
-#define CA_TEXT N_( "Root CA file" )
-#define CA_LONGTEXT N_( "Path to the x509 PEM trusted root CA certificates " \
- "(certificate authority) file that will be used by " \
- "the HTTP/SSL stream output. Leave empty if you " \
- "don't have one." )
-#define CRL_TEXT N_( "CRL file" )
-#define CRL_LONGTEXT N_( "Path to the x509 PEM Certificates Revocation List " \
- "file that will be HTTP/SSL stream output. Leave " \
- "empty if you don't have one." )
-
-vlc_module_begin();
- set_description( _("HTTP stream output") );
- set_capability( "sout access", 0 );
- set_shortname( N_("HTTP" ) );
- add_shortcut( "http" );
- add_shortcut( "https" );
- add_shortcut( "mmsh" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_ACO );
- add_string( SOUT_CFG_PREFIX "user", "", NULL,
- USER_TEXT, USER_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
- PASS_TEXT, PASS_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "mime", "", NULL,
- MIME_TEXT, MIME_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
- CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
- KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
- CA_TEXT, CA_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
- CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
- set_callbacks( Open, Close );
-vlc_module_end();
+#define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \
+ "if not specified)." )
+
+
+vlc_module_begin ()
+ set_description( N_("HTTP stream output") )
+ set_capability( "sout access", 0 )
+ set_shortname( "HTTP" )
+ add_shortcut( "http", "https", "mmsh" )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_ACO )
+ add_string( SOUT_CFG_PREFIX "user", "",
+ USER_TEXT, USER_LONGTEXT, true )
+ add_password( SOUT_CFG_PREFIX "pwd", "",
+ PASS_TEXT, PASS_LONGTEXT, true )
+ add_string( SOUT_CFG_PREFIX "mime", "",
+ MIME_TEXT, MIME_LONGTEXT, true )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
- "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
+static const char *const ppsz_sout_options[] = {
+ "user", "pwd", "mime", NULL
};
-static int Write( sout_access_out_t *, block_t * );
+static ssize_t Write( sout_access_out_t *, block_t * );
static int Seek ( sout_access_out_t *, off_t );
+static int Control( sout_access_out_t *, int, va_list );
struct sout_access_out_sys_t
{
int i_header_allocated;
int i_header_size;
uint8_t *p_header;
- vlc_bool_t b_header_complete;
+ bool b_header_complete;
};
/*****************************************************************************
sout_access_out_t *p_access = (sout_access_out_t*)p_this;
sout_access_out_sys_t *p_sys;
- char *psz_parser, *psz_name;
-
- char *psz_bind_addr;
- int i_bind_port;
- char *psz_file_name;
- char *psz_user = NULL;
- char *psz_pwd = NULL;
- char *psz_mime = NULL;
- const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
- *psz_crl = NULL;
- vlc_value_t val;
+ char *psz_user;
+ char *psz_pwd;
+ char *psz_mime;
if( !( p_sys = p_access->p_sys =
malloc( sizeof( sout_access_out_sys_t ) ) ) )
- {
- msg_Err( p_access, "Not enough memory" );
return VLC_ENOMEM ;
- }
- sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
+ config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
- /* p_access->psz_name host.name:port/filename */
- psz_name = psz_parser = strdup( p_access->psz_name );
-
- psz_bind_addr = psz_parser;
- i_bind_port = 0;
- psz_file_name = "";
-
- while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' )
- {
- psz_parser++;
- }
- if( *psz_parser == ':' )
+ const char *path = p_access->psz_path;
+ path += strcspn( path, "/" );
+ if( path > p_access->psz_path )
{
- *psz_parser = '\0';
- psz_parser++;
- i_bind_port = atoi( psz_parser );
-
- while( *psz_parser && *psz_parser != '/' )
+ const char *port = strrchr( p_access->psz_path, ':' );
+ if( port != NULL && strchr( port, ']' ) != NULL )
+ port = NULL; /* IPv6 numeral */
+ if( port != p_access->psz_path )
{
- psz_parser++;
+ int len = (port ? port : path) - p_access->psz_path;
+ msg_Warn( p_access, "\"%.*s\" HTTP host might be ignored in "
+ "multiple-host configurations, use at your own risks.",
+ len, p_access->psz_path );
+ msg_Info( p_access, "Consider passing --http-host=IP on the "
+ "command line instead." );
+
+ char host[len + 1];
+ strncpy( host, p_access->psz_path, len );
+ host[len] = '\0';
+
+ var_Create( p_access, "http-host", VLC_VAR_STRING );
+ var_SetString( p_access, "http-host", host );
+ }
+ if( port != NULL )
+ {
+ /* int len = path - ++port;
+ msg_Info( p_access, "Consider passing --%s-port=%.*s on the "
+ "command line instead.",
+ strcasecmp( p_access->psz_access, "https" )
+ ? "http" : "https", len, port ); */
+ port++;
+
+ int bind_port = atoi( port );
+ if( bind_port > 0 )
+ {
+ const char *var = strcasecmp( p_access->psz_access, "https" )
+ ? "http-port" : "https-port";
+ var_Create( p_access, var, VLC_VAR_INTEGER );
+ var_SetInteger( p_access, var, bind_port );
+ }
}
}
- if( *psz_parser == '/' )
- {
- *psz_parser = '\0';
- psz_parser++;
- psz_file_name = psz_parser;
- }
-
- if( !*psz_file_name )
- {
- psz_file_name = strdup( "/" );
- }
- else if( *psz_file_name != '/' )
- {
- char *p = psz_file_name;
-
- psz_file_name = malloc( strlen( p ) + 2 );
- strcpy( psz_file_name, "/" );
- strcat( psz_file_name, p );
- }
- else
- {
- psz_file_name = strdup( psz_file_name );
- }
+ if( !*path )
+ path = "/";
- /* SSL support */
+ /* TLS support */
if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) )
- {
- psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"cert" );
- psz_key = config_GetPsz( p_this, SOUT_CFG_PREFIX"key" );
- psz_ca = config_GetPsz( p_this, SOUT_CFG_PREFIX"ca" );
- psz_crl = config_GetPsz( p_this, SOUT_CFG_PREFIX"crl" );
-
- if( i_bind_port <= 0 )
- i_bind_port = DEFAULT_SSL_PORT;
- }
+ p_sys->p_httpd_host = vlc_https_HostNew( VLC_OBJECT(p_access) );
else
- {
- if( i_bind_port <= 0 )
- i_bind_port = DEFAULT_PORT;
- }
+ p_sys->p_httpd_host = vlc_http_HostNew( VLC_OBJECT(p_access) );
- p_sys->p_httpd_host = httpd_TLSHostNew( VLC_OBJECT(p_access),
- psz_bind_addr, i_bind_port,
- psz_cert, psz_key, psz_ca,
- psz_crl );
if( p_sys->p_httpd_host == NULL )
{
- msg_Err( p_access, "cannot listen on %s:%d",
- psz_bind_addr, i_bind_port );
- free( psz_name );
- free( psz_file_name );
+ msg_Err( p_access, "cannot start HTTP server" );
free( p_sys );
return VLC_EGENERIC;
}
+ psz_user = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "user" );
+ psz_pwd = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "pwd" );
if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) )
{
psz_mime = strdup( "video/x-ms-asf-stream" );
}
else
{
- var_Get( p_access, SOUT_CFG_PREFIX "mime", &val );
- if( *val.psz_string )
- psz_mime = val.psz_string;
- else
- free( val.psz_string );
+ psz_mime = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "mime" );
}
- var_Get( p_access, SOUT_CFG_PREFIX "user", &val );
- if( *val.psz_string )
- psz_user = val.psz_string;
- else
- free( val.psz_string );
-
- var_Get( p_access, SOUT_CFG_PREFIX "pwd", &val );
- if( *val.psz_string )
- psz_pwd = val.psz_string;
- else
- free( val.psz_string );
-
p_sys->p_httpd_stream =
- httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
- psz_user, psz_pwd, NULL, 0 );
- if( psz_user ) free( psz_user );
- if( psz_pwd ) free( psz_pwd );
- if( psz_mime ) free( psz_mime );
+ httpd_StreamNew( p_sys->p_httpd_host, path, psz_mime,
+ psz_user, psz_pwd );
+ free( psz_user );
+ free( psz_pwd );
+ free( psz_mime );
if( p_sys->p_httpd_stream == NULL )
{
- msg_Err( p_access, "cannot add stream %s", psz_file_name );
+ msg_Err( p_access, "cannot add stream %s", path );
httpd_HostDelete( p_sys->p_httpd_host );
- free( psz_name );
- free( psz_file_name );
free( p_sys );
return VLC_EGENERIC;
}
- free( psz_file_name );
- free( psz_name );
-
p_sys->i_header_allocated = 1024;
p_sys->i_header_size = 0;
- p_sys->p_header = malloc( p_sys->i_header_allocated );
- p_sys->b_header_complete = VLC_FALSE;
+ p_sys->p_header = xmalloc( p_sys->i_header_allocated );
+ p_sys->b_header_complete = false;
p_access->pf_write = Write;
p_access->pf_seek = Seek;
-
-
- /* update p_sout->i_out_pace_nocontrol */
- p_access->p_sout->i_out_pace_nocontrol++;
+ p_access->pf_control = Control;
return VLC_SUCCESS;
}
sout_access_out_t *p_access = (sout_access_out_t*)p_this;
sout_access_out_sys_t *p_sys = p_access->p_sys;
- /* update p_sout->i_out_pace_nocontrol */
- p_access->p_sout->i_out_pace_nocontrol--;
-
httpd_StreamDelete( p_sys->p_httpd_stream );
httpd_HostDelete( p_sys->p_httpd_host );
- FREE( p_sys->p_header );
+ free( p_sys->p_header );
msg_Dbg( p_access, "Close" );
free( p_sys );
}
+static int Control( sout_access_out_t *p_access, int i_query, va_list args )
+{
+ (void)p_access;
+
+ switch( i_query )
+ {
+ case ACCESS_OUT_CONTROLS_PACE:
+ *va_arg( args, bool * ) = false;
+ break;
+
+ default:
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* Write:
*****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
{
sout_access_out_sys_t *p_sys = p_access->p_sys;
int i_err = 0;
+ int i_len = 0;
while( p_buffer )
{
{
/* free previously gathered header */
p_sys->i_header_size = 0;
- p_sys->b_header_complete = VLC_FALSE;
+ p_sys->b_header_complete = false;
}
if( (int)(p_buffer->i_buffer + p_sys->i_header_size) >
p_sys->i_header_allocated )
{
p_sys->i_header_allocated =
p_buffer->i_buffer + p_sys->i_header_size + 1024;
- p_sys->p_header =
- realloc( p_sys->p_header, p_sys->i_header_allocated );
+ p_sys->p_header = xrealloc( p_sys->p_header,
+ p_sys->i_header_allocated );
}
memcpy( &p_sys->p_header[p_sys->i_header_size],
p_buffer->p_buffer,
}
else if( !p_sys->b_header_complete )
{
- p_sys->b_header_complete = VLC_TRUE;
+ p_sys->b_header_complete = true;
httpd_StreamHeader( p_sys->p_httpd_stream, p_sys->p_header,
p_sys->i_header_size );
}
+ i_len += p_buffer->i_buffer;
/* send data */
i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer,
p_buffer->i_buffer );
block_ChainRelease( p_buffer );
}
- return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
+ return( i_err < 0 ? VLC_EGENERIC : i_len );
}
/*****************************************************************************
*****************************************************************************/
static int Seek( sout_access_out_t *p_access, off_t i_pos )
{
+ (void)i_pos;
msg_Warn( p_access, "HTTP sout access cannot seek" );
return VLC_EGENERIC;
}
projects / vlc / blobdiff