src/stream_output/sap.c \
src/misc/charset.c \
src/misc/httpd.c \
+ src/misc/tls.c \
src/misc/mtime.c \
src/misc/block.c \
src/misc/modules.c \
\r
Status: Todo\r
\r
+Task\r
+Difficulty: Medium\r
+Platform: any\r
+Urgency: Wishlist\r
+Description: More service discovry modules\r
+- Port UPnP support from http://sourceforge.net/project/showfiles.php?group_id=89768 <br />\r
+- libhal based discovery (should be able to find cd,dvd,capture cards,etc etc <br />\r
+- Perhaps a generalized webpage parser (use user supplied templates to parse\r
+ streams from popular websites )\r
+Status: Todo\r
\r
# Do not remove me\r
Task\r
* Allocates a whole server's TLS credentials.
* Returns NULL on error.
*****************************************************************************/
-# define tls_ServerCreate( a, b, c ) (((tls_t *)a)->pf_server_create (a, b, c))
+# define __tls_ServerCreate( a, b, c ) (((tls_t *)a)->pf_server_create (a, b, c))
+VLC_EXPORT( tls_server_t *, tls_ServerCreate, ( vlc_object_t *, const char *, const char * ) );
/*****************************************************************************
* tls_ServerAddCA:
# define tls_ServerAddCRL( a, b ) (((tls_server_t *)a)->pf_add_CRL (a, b))
-# define tls_ServerDelete( a ) (((tls_server_t *)a)->pf_delete ( a ))
+# define __tls_ServerDelete( a ) (((tls_server_t *)a)->pf_delete ( a ))
+VLC_EXPORT( void, tls_ServerDelete, ( tls_server_t * ) );
# define tls_ServerSessionPrepare( a ) (((tls_server_t *)a)->pf_session_prepare (a))
#include <vlc/sout.h>
#include "vlc_httpd.h"
+#include "vlc_tls.h"
#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-#define DEFAULT_PORT 8080
+#define DEFAULT_PORT 8080
+#define DEFAULT_SSL_PORT 8443
/*****************************************************************************
* Module descriptor
"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 CERT_TEXT N_( "Certificate file" )
+#define CERT_LONGTEXT N_( "HTTP/SSL stream output x509 PEM certificate file" )
+#define KEY_TEXT N_( "Private key file" )
+#define KEY_LONGTEXT N_( "HTTP/SSL stream output x509 PEM private key file" )
+#define CA_TEXT N_( "Root CA file" )
+#define CA_LONGTEXT N_( "HTTP/SSL stream output x509 PEM trusted root CA certificates file" )
+#define CRL_TEXT N_( "CRL file" )
+#define CRL_LONGTEXT N_( "HTTP/SSL stream output Certificates Revocation List file" )
vlc_module_begin();
set_description( _("HTTP stream output") );
set_capability( "sout access", 0 );
add_shortcut( "http" );
+ add_shortcut( "https" );
add_shortcut( "mmsh" );
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 );
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;
+ tls_server_t *p_tls;
char *psz_parser, *psz_name;
malloc( sizeof( sout_access_out_sys_t ) ) ) )
{
msg_Err( p_access, "Not enough memory" );
- return( VLC_EGENERIC );
+ return VLC_ENOMEM ;
}
sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
psz_file_name = psz_parser;
}
- if( i_bind_port <= 0 )
- {
- i_bind_port = DEFAULT_PORT;
- }
-
if( !*psz_file_name )
{
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" ) )
+ {
+ 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;
+ }
+
+ 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 );
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( p_sys );
#define SRC_TEXT N_( "Source directory" )
#define SRC_LONGTEXT N_( "Source directory" )
#define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "x509 PEM certificates path file" )
+#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file (enables SSL)" )
#define KEY_TEXT N_( "Private key file" )
-#define KEY_LONGTEXT N_( "x509 PEM private key file" )
+#define KEY_LONGTEXT N_( "HTTP interface x509 PEM private key file" )
#define CA_TEXT N_( "Root CA file" )
-#define CA_LONGTEXT N_( "x509 PEM trusted root CA certificates file" )
+#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA certificates file" )
#define CRL_TEXT N_( "CRL file" )
-#define CRL_LONGTEXT N_( "Certificates revocation list file" )
+#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" )
vlc_module_begin();
set_description( _("HTTP remote control interface") );
playlist_t *p_playlist;
input_thread_t *p_input;
vlm_t *p_vlm;
- tls_t *p_tls;
};
p_sys->p_input = NULL;
p_sys->p_vlm = NULL;
- /* TODO: avoid possible code duplication in other modules */
psz_cert = config_GetPsz( p_intf, "http-intf-cert" );
if ( psz_cert != NULL )
{
const char *psz_pem;
- p_sys->p_tls = vlc_object_create( p_this, VLC_OBJECT_TLS );
- vlc_object_attach( p_sys->p_tls, p_this );
-
- p_sys->p_tls->p_module = module_Need( p_sys->p_tls, "tls", 0, 0 );
- if( p_sys->p_tls->p_module == NULL )
- {
- msg_Err( p_this, "cannot find TLS/SSL provider" );
- vlc_object_detach( p_sys->p_tls );
- vlc_object_destroy( p_sys->p_tls );
- p_sys->p_tls = NULL;
- return VLC_EGENERIC;
- }
-
msg_Dbg( p_intf, "enablind TLS for HTTP interface (cert file: %s)",
psz_cert );
psz_pem = config_GetPsz( p_intf, "http-intf-key" );
- if ( psz_pem == NULL )
- psz_pem = psz_cert;
- p_tls = tls_ServerCreate( p_sys->p_tls, psz_cert, psz_pem );
+ p_tls = tls_ServerCreate( p_this, psz_cert, psz_pem );
if ( p_tls == NULL )
{
msg_Err( p_intf, "TLS initialization error" );
}
else
{
- p_sys->p_tls = NULL;
p_tls = NULL;
if( i_port <= 0 )
i_port= 8080;
free( p_sys->pp_files );
}
httpd_HostDelete( p_sys->p_httpd_host );
- /* TODO: do this in the httpd code to avoid code duplication */
- if( p_sys->p_tls != NULL )
- {
- module_Unneed( p_sys->p_tls, p_sys->p_tls->p_module );
- vlc_object_detach( p_sys->p_tls );
- vlc_object_destroy( p_sys->p_tls );
- }
free( p_sys );
}
--- /dev/null
+/*****************************************************************************
+ * tls.c
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: httpd.c 8263 2004-07-24 09:06:58Z courmisch $
+ *
+ * Authors: Remi Denis-Courmont <courmisch@via.ecp.fr>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#include <stdlib.h>
+#include <vlc/vlc.h>
+
+#include "vlc_tls.h"
+
+
+/*
+ * TODO:
+ * - client side stuff,
+ * - server-side client cert validation,
+ * - client-side server cert validation (?).
+ */
+
+/*****************************************************************************
+ * tls_ServerCreate:
+ *****************************************************************************
+ * Allocates a whole server's TLS credentials.
+ * Returns NULL on error.
+ *****************************************************************************/
+tls_server_t *
+tls_ServerCreate( vlc_object_t *p_this, const char *psz_cert,
+ const char *psz_key )
+{
+ tls_t *p_tls;
+ tls_server_t *p_server;
+ const char *psz_pem;
+
+ p_tls = vlc_object_create( p_this, VLC_OBJECT_TLS );
+ vlc_object_attach( p_tls, p_this );
+
+ p_tls->p_module = module_Need( p_tls, "tls", 0, 0 );
+ if( p_tls->p_module != NULL )
+ {
+ if( psz_key == NULL )
+ psz_key = psz_cert;
+
+ p_server = __tls_ServerCreate( p_tls, psz_cert, psz_key );
+ if( p_server != NULL )
+ {
+ msg_Dbg( p_this, "TLS/SSL provider initialized" );
+ return p_server;
+ }
+ else
+ msg_Err( p_this, "TLS/SSL provider error" );
+ module_Unneed( p_tls, p_tls->p_module );
+ }
+ else
+ msg_Err( p_this, "TLS/SSL provider not found" );
+
+ vlc_object_detach( p_tls );
+ vlc_object_destroy( p_tls );
+ return NULL;
+}
+
+
+/*****************************************************************************
+ * tls_ServerDelete:
+ *****************************************************************************
+ * Releases data allocated with tls_ServerCreate
+ *****************************************************************************/
+void
+tls_ServerDelete( tls_server_t *p_server )
+{
+ tls_t *p_tls = p_server->p_tls;
+
+ __tls_ServerDelete( p_server );
+
+ module_Unneed( p_tls, p_tls->p_module );
+ vlc_object_detach( p_tls );
+ vlc_object_destroy( p_tls );
+}
+
projects / vlc / commitdiff