X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fhttp.c;h=a04f87aaa5f212a4aa5fe030f3b3e7c218b3b03c;hb=3ab81753822bd0a37786e6fd026a349e7a0e0830;hp=e6504bdb92e13c429df711a32c6c73fe62d4c2c7;hpb=9835f07bb2cf049dc4ed2250a2bc35ae1a7f8f24;p=vlc diff --git a/modules/access_output/http.c b/modules/access_output/http.c index e6504bdb92..a04f87aaa5 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -25,14 +25,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#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 ) @@ -44,8 +50,6 @@ #include "vlc_httpd.h" -#define FREE( p ) if( p ) { free( p); (p) = NULL; } - #define DEFAULT_PORT 8080 #define DEFAULT_SSL_PORT 8443 @@ -63,12 +67,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." ) @@ -92,7 +93,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_description( _("HTTP stream output") ); set_capability( "sout access", 0 ); - set_shortname( N_("HTTP" ) ); + set_shortname( "HTTP" ); add_shortcut( "http" ); add_shortcut( "https" ); add_shortcut( "mmsh" ); @@ -113,7 +114,7 @@ vlc_module_begin(); 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); + BONJOUR_TEXT, BONJOUR_LONGTEXT, VLC_TRUE); set_callbacks( Open, Close ); vlc_module_end(); @@ -125,7 +126,7 @@ static const char *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 @@ -174,13 +175,13 @@ static int Open( vlc_object_t *p_this ) 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 = ""; + psz_file_name = NULL; while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) { @@ -204,7 +205,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( "/" ); } @@ -281,9 +282,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 ) { @@ -298,43 +299,33 @@ static int Open( vlc_object_t *p_this ) #ifdef HAVE_AVAHI_CLIENT if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") ) { - playlist_t *p_playlist; char *psz_txt, *psz_name; + playlist_t *p_playlist = pl_Yield( p_access ); - p_playlist = (playlist_t *)vlc_object_find( p_access, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - msg_Err( p_access, "unable to find playlist" ); - httpd_StreamDelete( p_sys->p_httpd_stream ); - httpd_HostDelete( p_sys->p_httpd_host ); - free( (void *)p_sys ); - return VLC_EGENERIC; - } - - 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_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 ); + psz_name, i_bind_port, psz_txt ); + free( psz_uri ); free( (void *)psz_txt ); if( p_sys->p_bonjour == NULL ) - { - vlc_object_release( p_playlist ); - httpd_StreamDelete( p_sys->p_httpd_stream ); - httpd_HostDelete( p_sys->p_httpd_host ); - free( (void *)p_sys ); - return VLC_EGENERIC; - } - vlc_object_release( p_playlist ); + msg_Err( p_access, "unable to start requested Bonjour announce" ); + pl_Release( p_playlist ); } else p_sys->p_bonjour = NULL; @@ -376,7 +367,7 @@ static void Close( vlc_object_t * p_this ) 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" ); @@ -386,10 +377,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 ) { @@ -425,6 +417,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 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 ); @@ -444,7 +437,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 ); } /*****************************************************************************