Changeset 5aa8d01f4893a235c45968c54ab122941abcb8ec

Timestamp:

06/11/04 17:26:40 (4 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1099758400 +0000

git-parent:

[ed4973755c4df225a7390edf03f7b980fda313f7]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1099758400 +0000

Message:

HTTP/SSL stream output

Files:

• modules/access_output/http.c (modified) (8 diffs)

modules/access_output/http.c

@@ -31 +31 @@
-
-#include "vlc_httpd.h"
+#include "vlc_tls.h"
-
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-
-
+
+
-
-/*****************************************************************************
@@ -52 +54 @@
-#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();
@@ -57 +67 @@
-    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();
@@ -97 +112 @@
-    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;
@@ -112 +128 @@
-    {
-        msg_Err( p_access, "Not enough memory" );
-( VLC_EGENERIC )
+ VLC_ENOMEM 
-    }
-
@@ -146 +162 @@
-    }
-
-    if( i_bind_port <= 0 )
-    {
-        i_bind_port = DEFAULT_PORT;
-    }
-
-    if( !*psz_file_name )
-    {
@@ -168 +179 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if( p_sys->p_httpd_host == NULL )
-    {
@@ -175 +236 @@
-                 psz_bind_addr, i_bind_port );
-
+        if( p_tls != NULL )
+            tls_ServerDelete( p_tls );
-        free( psz_name );
-        free( psz_file_name );