*
* 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>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#ifdef HAVE_AVAHI_CLIENT
- #include <vlc/intf.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+
+#ifdef HAVE_AVAHI_CLIENT
#include "bonjour.h"
#if defined( WIN32 )
#include "vlc_httpd.h"
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-
#define DEFAULT_PORT 8080
#define DEFAULT_SSL_PORT 8443
#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_capability( "sout access", 0 );
- set_shortname( N_("HTTP" ) );
+ set_shortname( "HTTP" );
add_shortcut( "http" );
add_shortcut( "https" );
add_shortcut( "mmsh" );
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();
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_parser;
char *psz_bind_addr;
int i_bind_port;
*psz_crl = NULL;
vlc_value_t val;
-#ifdef HAVE_AVAHI_CLIENT
- playlist_t *p_playlist;
- char *psz_txt;
-#endif
-
if( !( p_sys = p_access->p_sys =
malloc( sizeof( sout_access_out_sys_t ) ) ) )
{
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 != '/' )
{
psz_file_name = psz_parser;
}
- if( !*psz_file_name )
+ if( psz_file_name == NULL )
{
psz_file_name = strdup( "/" );
}
{
msg_Err( p_access, "cannot listen on %s:%d",
psz_bind_addr, i_bind_port );
- 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" ) )
{
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
- asprintf( &psz_txt, "path=%s", psz_file_name );
-#endif
+ if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") )
+ {
+ char *psz_txt, *psz_name;
+ playlist_t *p_playlist = pl_Yield( p_access );
- free( psz_file_name );
- free( psz_name );
+ 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;
-#ifdef HAVE_AVAHI_CLIENT
- 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_HostDelete( p_sys->p_httpd_host );
- free( (void *)psz_txt );
- free( (void *)p_sys );
- return VLC_EGENERIC;
- }
+ asprintf( &psz_txt, "path=%s", psz_name );
- psz_name = strrchr( p_playlist->status.p_item->input.psz_uri,
- DIRECTORY_SEPARATOR );
- if( psz_name != NULL ) psz_name++;
- else psz_name = p_playlist->status.p_item->input.psz_uri;
+ free( psz_uri );
- p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
- "_vlc-http._tcp",
- psz_name, i_bind_port, psz_txt );
- free( (void *)psz_txt );
- if( p_sys->p_bonjour == NULL )
- {
+ 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 );
+
+ if( p_sys->p_bonjour == NULL )
+ msg_Err( p_access, "unable to start requested Bonjour announce" );
vlc_object_release( p_playlist );
- httpd_HostDelete( p_sys->p_httpd_host );
- free( (void *)p_sys );
- return VLC_EGENERIC;
}
-
- vlc_object_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 );
sout_access_out_sys_t *p_sys = p_access->p_sys;
#ifdef HAVE_AVAHI_CLIENT
- bonjour_stop_service( p_sys->p_bonjour );
+ if( p_sys->p_bonjour != NULL )
+ bonjour_stop_service( p_sys->p_bonjour );
#endif
/* update p_sout->i_out_pace_nocontrol */
{
sout_access_out_sys_t *p_sys = p_access->p_sys;
int i_err = 0;
+ int i_len = 0;
while( 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 );
block_ChainRelease( p_buffer );
}
- return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
+ return( i_err < 0 ? VLC_EGENERIC : i_len );
}
/*****************************************************************************
projects / vlc / blobdiff