X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fhttp.c;h=a55a1d497ebfbefc5a8d6c1769c19d5820b2dfe1;hb=a396b96cc7981eb6aee5d3fb2b8437147b645d22;hp=907ce3227173adac0e34774573fcc4ed4fab0a15;hpb=415749bf918d5ca772e1f9ba9f1260d7ab115d3e;p=vlc diff --git a/modules/access_output/http.c b/modules/access_output/http.c index 907ce32271..a55a1d497e 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -25,14 +25,21 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include -#ifdef HAVE_AVAHI_CLIENT - #include +#include +#include + +#ifdef HAVE_AVAHI_CLIENT #include "bonjour.h" #if defined( WIN32 ) @@ -61,12 +68,9 @@ static void Close( vlc_object_t * ); #define PASS_TEXT N_("Password") #define PASS_LONGTEXT N_("Password that will be " \ "requested to access the stream." ) - -/// \bug [String] missing closing parenthesis #define MIME_TEXT N_("Mime") #define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \ - "if not specified." ) - + "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." ) @@ -88,30 +92,30 @@ static void Close( vlc_object_t * ); 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 ); - add_bool( SOUT_CFG_PREFIX "bonjour", VLC_FALSE, NULL, - BONJOUR_TEXT, BONJOUR_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(); @@ -119,12 +123,13 @@ 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 ); +static int Control( sout_access_out_t *, int, va_list ); struct sout_access_out_sys_t { @@ -138,7 +143,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; + bool b_header_complete; #ifdef HAVE_AVAHI_CLIENT void *p_bonjour; @@ -161,62 +166,50 @@ static int Open( vlc_object_t *p_this ) char *psz_user = NULL; char *psz_pwd = NULL; char *psz_mime = NULL; - const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = 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 = "hostname:port/filename" */ - psz_bind_addr = psz_parser = strdup( p_access->psz_name ); + /* p_access->psz_path = "hostname:port/filename" */ + psz_bind_addr = psz_parser = strdup( p_access->psz_path ); i_bind_port = 0; - psz_file_name = ""; - - while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) - { - psz_parser++; - } - if( *psz_parser == ':' ) - { - *psz_parser = '\0'; - psz_parser++; - i_bind_port = atoi( psz_parser ); - while( *psz_parser && *psz_parser != '/' ) - { - psz_parser++; - } - } - if( *psz_parser == '/' ) + psz_parser = strchr( psz_bind_addr, '/' ); + if( psz_parser ) { + psz_file_name = strdup( psz_parser ); *psz_parser = '\0'; - psz_parser++; - psz_file_name = psz_parser; } - - if( !*psz_file_name ) - { + else 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 ); + if( psz_bind_addr[0] == '[' ) + { + psz_bind_addr++; + psz_parser = strstr( psz_bind_addr, "]:" ); + if( psz_parser ) + { + *psz_parser = '\0'; + i_bind_port = atoi( psz_parser + 2 ); + } + psz_parser = psz_bind_addr - 1; } else { - psz_file_name = strdup( psz_file_name ); + psz_parser = strrchr( psz_bind_addr, ':' ); + if( psz_parser ) + { + *psz_parser = '\0'; + i_bind_port = atoi( psz_parser + 1 ); + } + psz_parser = psz_bind_addr; } /* SSL support */ @@ -240,16 +233,21 @@ static int Open( vlc_object_t *p_this ) psz_bind_addr, i_bind_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_access, "cannot listen on %s:%d", + msg_Err( p_access, "cannot listen on %s port %d", psz_bind_addr, i_bind_port ); free( psz_file_name ); - free( psz_bind_addr ); + free( psz_parser ); free( p_sys ); return VLC_EGENERIC; } - free( psz_bind_addr ); + free( psz_parser ); if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) ) { @@ -279,9 +277,9 @@ 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, NULL ); - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); - if( psz_mime ) free( psz_mime ); + free( psz_user ); + free( psz_pwd ); + free( psz_mime ); if( p_sys->p_httpd_stream == NULL ) { @@ -293,28 +291,36 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } -#ifdef HAVE_AVAHI_CLIENT +#if 0 //def 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 ); + playlist_t *p_playlist = pl_Hold( p_access ); - psz_name = strrchr( p_playlist->status.p_item->p_input->psz_uri, - DIRECTORY_SEPARATOR ); + 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 = p_playlist->status.p_item->p_input->psz_uri; + else psz_name = psz_newuri; - asprintf( &psz_txt, "path=%s", psz_file_name ); + 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( (void *)psz_txt ); + free( psz_uri ); + free( psz_txt ); if( p_sys->p_bonjour == NULL ) msg_Err( p_access, "unable to start requested Bonjour announce" ); - vlc_object_release( p_playlist ); + pl_Release( p_access ); } else p_sys->p_bonjour = NULL; @@ -325,14 +331,11 @@ static int Open( vlc_object_t *p_this ) 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; - - - /* update p_sout->i_out_pace_nocontrol */ - p_access->p_sout->i_out_pace_nocontrol++; + p_access->pf_control = Control; return VLC_SUCCESS; } @@ -350,26 +353,40 @@ static void Close( vlc_object_t * p_this ) 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" ); 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 ) { @@ -382,7 +399,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 ) @@ -399,12 +416,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 ); @@ -424,7 +442,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 ); } /***************************************************************************** @@ -432,6 +450,7 @@ static int 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; }