X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fhttp.c;h=fff220d4a19b88b343063083dcf9bf48fc4cd0a9;hb=a5c83dda798f93cc7a76bbb50d89352117e6ec46;hp=0de31cf4630201f325271ddda508c11b4bd77d28;hpb=906b68fe0317ff981addd5e9bfe4a5fc5efde6c3;p=vlc diff --git a/modules/access_output/http.c b/modules/access_output/http.c index 0de31cf463..fff220d4a1 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -1,10 +1,11 @@ /***************************************************************************** * http.c ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN + * Copyright (C) 2001-2005 the VideoLAN team * $Id$ * * Authors: Laurent Aimar + * Jon Lech Johansen * * 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 @@ -18,21 +19,37 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_httpd.h" -#include "vlc_tls.h" +#include +#include +#include +#include + + +#include +#include -#define FREE( p ) if( p ) { free( p); (p) = NULL; } +#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 @@ -46,54 +63,59 @@ static void Close( vlc_object_t * ); #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 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 by the HTTP/SSL stream output" ) + "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 by the HTTP/SSL stream output. Leave " \ + "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 by " \ - "the HTTP/SSL stream output. Leave empty if you " \ + "(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 HTTP/SSL stream output. Leave " \ + "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_description( N_("HTTP stream output") ); set_capability( "sout access", 0 ); - set_shortname( N_("HTTP" ) ); + 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 ); + USER_TEXT, USER_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "pwd", "", NULL, - PASS_TEXT, PASS_LONGTEXT, VLC_TRUE ); + PASS_TEXT, PASS_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "mime", "", NULL, - MIME_TEXT, MIME_LONGTEXT, VLC_TRUE ); + MIME_TEXT, MIME_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, - CERT_TEXT, CERT_LONGTEXT, VLC_TRUE ); + CERT_TEXT, CERT_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "key", NULL, NULL, - KEY_TEXT, KEY_LONGTEXT, VLC_TRUE ); + KEY_TEXT, KEY_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, - CA_TEXT, CA_LONGTEXT, VLC_TRUE ); + CA_TEXT, CA_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, - CRL_TEXT, CRL_LONGTEXT, VLC_TRUE ); + CRL_TEXT, CRL_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL, + BONJOUR_TEXT, BONJOUR_LONGTEXT, true); set_callbacks( Open, Close ); vlc_module_end(); @@ -101,11 +123,11 @@ vlc_module_end(); /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "user", "pwd", "mime", "cert", "key", "ca", "crl", 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 ); struct sout_access_out_sys_t @@ -120,7 +142,11 @@ 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; + +#ifdef HAVE_AVAHI_CLIENT + void *p_bonjour; +#endif }; /***************************************************************************** @@ -130,9 +156,8 @@ 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; - tls_server_t *p_tls; - char *psz_parser, *psz_name; + char *psz_parser; char *psz_bind_addr; int i_bind_port; @@ -140,23 +165,21 @@ static int Open( vlc_object_t *p_this ) char *psz_user = NULL; char *psz_pwd = NULL; char *psz_mime = NULL; + char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL, + *psz_crl = NULL; vlc_value_t val; 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 ); + /* p_access->psz_path = "hostname:port/filename" */ + psz_bind_addr = psz_parser = strdup( p_access->psz_path ); - psz_bind_addr = psz_parser; i_bind_port = 0; - psz_file_name = ""; + psz_file_name = NULL; while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) { @@ -180,7 +203,7 @@ static int Open( vlc_object_t *p_this ) psz_file_name = psz_parser; } - if( !*psz_file_name ) + if( psz_file_name == NULL ) { psz_file_name = strdup( "/" ); } @@ -200,67 +223,39 @@ static int Open( vlc_object_t *p_this ) /* SSL support */ if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) ) { - const char *psz_cert, *psz_key; psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"cert" ); psz_key = config_GetPsz( p_this, SOUT_CFG_PREFIX"key" ); - - p_tls = tls_ServerCreate( p_this, psz_cert, psz_key ); - if ( p_tls == NULL ) - { - msg_Err( p_this, "TLS initialization error" ); - free( psz_file_name ); - free( psz_name ); - free( p_sys ); - return VLC_EGENERIC; - } - - psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"ca" ); - if ( ( psz_cert != NULL) && tls_ServerAddCA( p_tls, psz_cert ) ) - { - msg_Err( p_this, "TLS CA error" ); - tls_ServerDelete( p_tls ); - free( psz_file_name ); - free( psz_name ); - free( p_sys ); - return VLC_EGENERIC; - } - - psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"crl" ); - if ( ( psz_cert != NULL) && tls_ServerAddCRL( p_tls, psz_cert ) ) - { - msg_Err( p_this, "TLS CRL error" ); - tls_ServerDelete( p_tls ); - free( psz_file_name ); - free( psz_name ); - free( p_sys ); - return VLC_EGENERIC; - } + 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; } else { - p_tls = NULL; if( i_bind_port <= 0 ) i_bind_port = DEFAULT_PORT; } p_sys->p_httpd_host = httpd_TLSHostNew( VLC_OBJECT(p_access), psz_bind_addr, i_bind_port, - p_tls ); + 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_access, "cannot listen on %s:%d", psz_bind_addr, i_bind_port ); - - if( p_tls != NULL ) - tls_ServerDelete( p_tls ); - free( psz_name ); free( psz_file_name ); + free( psz_bind_addr ); free( p_sys ); return VLC_EGENERIC; } + free( psz_bind_addr ); if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) ) { @@ -289,29 +284,62 @@ static int Open( vlc_object_t *p_this ) p_sys->p_httpd_stream = httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime, - psz_user, psz_pwd ); - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); - if( psz_mime ) free( psz_mime ); + psz_user, psz_pwd, NULL ); + 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 ); httpd_HostDelete( p_sys->p_httpd_host ); - free( psz_name ); 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_access ); + 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_access ); + } + else + p_sys->p_bonjour = NULL; +#endif + 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->b_header_complete = false; p_access->pf_write = Write; p_access->pf_seek = Seek; @@ -331,13 +359,18 @@ 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 ); - FREE( p_sys->p_header ); + free( p_sys->p_header ); msg_Dbg( p_access, "Close" ); @@ -347,10 +380,11 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * 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 ) { @@ -363,7 +397,7 @@ static int 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 ) @@ -380,12 +414,13 @@ static int 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 ); } + 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 ); @@ -405,7 +440,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) block_ChainRelease( p_buffer ); } - return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS ); + return( i_err < 0 ? VLC_EGENERIC : i_len ); } /*****************************************************************************