/*****************************************************************************
* http.c
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Jon Lech Johansen <jon@nanocrew.net>
*
* 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
*
* 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>
-#include "vlc_httpd.h"
+#include <stdlib.h>
+#include <stdio.h>
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
+#include <vlc_input.h>
+#include <vlc_playlist.h>
-#define DEFAULT_PORT 8080
+#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
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
+#define SOUT_CFG_PREFIX "sout-http-"
+
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("User name that will be " \
+ "requested to access the stream." )
+#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." )
+
+#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 ouput") );
+ 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();
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
+static const char *ppsz_sout_options[] = {
+ "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
+};
+
static int Write( sout_access_out_t *, block_t * );
static int Seek ( sout_access_out_t *, off_t );
int i_header_size;
uint8_t *p_header;
vlc_bool_t b_header_complete;
+
+#ifdef HAVE_AVAHI_CLIENT
+ void *p_bonjour;
+#endif
};
/*****************************************************************************
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;
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;
if( !( p_sys = p_access->p_sys =
malloc( sizeof( sout_access_out_sys_t ) ) ) )
{
msg_Err( p_access, "Not enough memory" );
- return( VLC_EGENERIC );
+ return VLC_ENOMEM ;
}
- /* p_access->psz_name host.name:port/filename */
- psz_name = psz_parser = strdup( p_access->psz_name );
+ 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 );
- 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( i_bind_port <= 0 )
- {
- i_bind_port = DEFAULT_PORT;
- }
-
- if( !*psz_file_name )
+ if( psz_file_name == NULL )
{
psz_file_name = strdup( "/" );
}
psz_file_name = strdup( psz_file_name );
}
- p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_access), psz_bind_addr,
- i_bind_port );
+ /* SSL 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;
+ }
+ else
+ {
+ 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,
+ 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_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" ) )
{
- psz_mime = "video/x-ms-asf-stream";
+ 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 );
+ }
+
+ 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,
- sout_cfg_find_value( p_access->p_cfg, "user" ),
- sout_cfg_find_value( p_access->p_cfg, "pwd" ) );
+ psz_user, psz_pwd, NULL );
+ if( psz_user ) free( psz_user );
+ if( psz_pwd ) free( psz_pwd );
+ if( psz_mime ) 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 );
+
+ psz_name = strrchr( p_playlist->status.p_item->p_input->psz_uri,
+ DIRECTORY_SEPARATOR );
+ if( psz_name != NULL ) psz_name++;
+ else psz_name = p_playlist->status.p_item->p_input->psz_uri;
+
+ asprintf( &psz_txt, "path=%s", psz_file_name );
+
+ 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 );
+ }
+ 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;
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--;
projects / vlc / blobdiff