X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fhttp.c;h=61095f5c749c37e9c6b0d5b44b83b4d8187ed5b2;hb=d8ac34d8f4812adc0bc51251ffa40092e65b43dd;hp=d46d1b7241b22b15db7cdc61571c8f829f471d41;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/access_output/http.c b/modules/access_output/http.c index d46d1b7241..61095f5c74 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -1,7 +1,7 @@ /***************************************************************************** * http.c ***************************************************************************** - * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2001-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -26,28 +26,19 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include #include - -#ifdef HAVE_AVAHI_CLIENT - #include "bonjour.h" - - #if defined( WIN32 ) - #define DIRECTORY_SEPARATOR '\\' - #else - #define DIRECTORY_SEPARATOR '/' - #endif -#endif - -#include "vlc_httpd.h" - -#define DEFAULT_PORT 8080 -#define DEFAULT_SSL_PORT 8443 +#include /***************************************************************************** * Module descriptor @@ -66,64 +57,35 @@ static void Close( vlc_object_t * ); #define MIME_TEXT N_("Mime") #define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \ "if not specified)." ) -#define CERT_TEXT N_( "Certificate file" ) -#define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\ - "be used for HTTPS." ) -#define KEY_TEXT N_( "Private key file" ) -#define KEY_LONGTEXT N_( "Path to the x509 PEM private key file that will " \ - "be used for HTTPS. 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 for " \ - "HTTPS. 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 used for SSL. Leave " \ - "empty if you don't have one." ) -#define BONJOUR_TEXT N_( "Advertise with Bonjour") -#define BONJOUR_LONGTEXT N_( "Advertise the stream with the Bonjour protocol." ) - - -vlc_module_begin(); - set_description( _("HTTP stream output") ); - set_capability( "sout access", 0 ); - set_shortname( "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 ); - add_bool( SOUT_CFG_PREFIX "bonjour", VLC_FALSE, NULL, - BONJOUR_TEXT, BONJOUR_LONGTEXT, VLC_TRUE); - set_callbacks( Open, Close ); -vlc_module_end(); + + +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 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 { @@ -137,11 +99,7 @@ struct sout_access_out_sys_t int i_header_allocated; int i_header_size; uint8_t *p_header; - vlc_bool_t b_header_complete; - -#ifdef HAVE_AVAHI_CLIENT - void *p_bonjour; -#endif + bool b_header_complete; }; /***************************************************************************** @@ -152,194 +110,109 @@ static int Open( vlc_object_t *p_this ) sout_access_out_t *p_access = (sout_access_out_t*)p_this; sout_access_out_sys_t *p_sys; - char *psz_parser; - - 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 ; - } config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg ); - /* p_access->psz_path = "hostname:port/filename" */ - psz_bind_addr = psz_parser = strdup( p_access->psz_path ); - - i_bind_port = 0; - psz_file_name = NULL; - - 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 == NULL ) - { - 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_file_name ); - free( psz_bind_addr ); + msg_Err( p_access, "cannot start HTTP server" ); free( p_sys ); return VLC_EGENERIC; } - free( psz_bind_addr ); + 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 ); + 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_file_name ); free( p_sys ); return VLC_EGENERIC; } -#ifdef HAVE_AVAHI_CLIENT - if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") ) - { - char *psz_txt, *psz_name; - playlist_t *p_playlist = pl_Yield( p_access ); - - char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input ); - char *psz_newuri = psz_uri; - psz_name = strrchr( psz_newuri, DIRECTORY_SEPARATOR ); - if( psz_name != NULL ) psz_name++; - else psz_name = psz_newuri; - - if( psz_file_name && - asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 ) - { - pl_Release( p_playlist ); - free( psz_uri ); - return VLC_ENOMEM; - } - - p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access, - strcmp( p_access->psz_access, "https" ) - ? "_vlc-http._tcp" : "_vlc-https._tcp", - psz_name, i_bind_port, psz_txt ); - free( psz_uri ); - free( (void *)psz_txt ); - - if( p_sys->p_bonjour == NULL ) - msg_Err( p_access, "unable to start requested Bonjour announce" ); - pl_Release( p_playlist ); - } - else - p_sys->p_bonjour = NULL; -#endif - - free( psz_file_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; } @@ -352,14 +225,6 @@ static void Close( vlc_object_t * p_this ) sout_access_out_t *p_access = (sout_access_out_t*)p_this; sout_access_out_sys_t *p_sys = p_access->p_sys; -#ifdef HAVE_AVAHI_CLIENT - if( p_sys->p_bonjour != NULL ) - bonjour_stop_service( p_sys->p_bonjour ); -#endif - - /* 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 ); @@ -370,6 +235,22 @@ static void Close( vlc_object_t * p_this ) 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: *****************************************************************************/ @@ -390,15 +271,15 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *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, @@ -407,7 +288,7 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *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 ); @@ -441,6 +322,7 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ 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; }