/*****************************************************************************
* http.c
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: http.c,v 1.2 2003/02/25 17:17:43 fenrir Exp $
+ * 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 <string.h>
-#include <errno.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "httpd.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
-#define DEFAULT_PORT 8080
+#include <vlc_input.h>
+#include <vlc_playlist.h>
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+#ifdef HAVE_AVAHI_CLIENT
+ #include "bonjour.h"
+
+ #if defined( WIN32 )
+ #define DIRECTORY_SEPARATOR '\\'
+ #else
+ #define DIRECTORY_SEPARATOR '/'
+ #endif
+#endif
-static int Write( sout_access_out_t *, sout_buffer_t * );
-static int Seek ( sout_access_out_t *, off_t );
+#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." )
+#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( N_("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, true );
+ add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
+ PASS_TEXT, PASS_LONGTEXT, true );
+ add_string( SOUT_CFG_PREFIX "mime", "", NULL,
+ MIME_TEXT, MIME_LONGTEXT, true );
+ add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
+ CERT_TEXT, CERT_LONGTEXT, true );
+ add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
+ KEY_TEXT, KEY_LONGTEXT, true );
+ add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
+ CA_TEXT, CA_LONGTEXT, true );
+ add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
+ CRL_TEXT, CRL_LONGTEXT, true );
+ add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
+ BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
set_callbacks( Open, Close );
vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static const char *const ppsz_sout_options[] = {
+ "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
+};
+
+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
{
- httpd_t *p_httpd;
-
/* host */
httpd_host_t *p_httpd_host;
int i_header_allocated;
int i_header_size;
uint8_t *p_header;
- vlc_bool_t b_header_complete;
-};
+ bool b_header_complete;
-static struct
-{
- char *psz_ext;
- char *psz_mime;
-} http_mime[] =
-{
- { ".avi", "video/avi" },
- { ".asf", "video/x-ms-asf" },
- { ".m1a", "audio/mpeg" },
- { ".m2a", "audio/mpeg" },
- { ".m1v", "video/mpeg" },
- { ".m2v", "video/mpeg" },
- { ".mp2", "audio/mpeg" },
- { ".mp3", "audio/mpeg" },
- { ".mpa", "audio/mpeg" },
- { ".mpg", "video/mpeg" },
- { ".mpeg", "video/mpeg" },
- { ".mpe", "video/mpeg" },
- { ".mov", "video/quicktime" },
- { ".moov", "video/quicktime" },
- { ".ogg", "application/ogg" },
- { ".ogm", "application/ogg" },
- { ".wav", "audio/wav" },
- { NULL, NULL }
+#ifdef HAVE_AVAHI_CLIENT
+ void *p_bonjour;
+#endif
};
-static char *GetMime( char *psz_name )
-{
- char *psz_ext;
-
- psz_ext = strrchr( psz_name, '.' );
- if( psz_ext )
- {
- int i;
-
- for( i = 0; http_mime[i].psz_ext != NULL ; i++ )
- {
- if( !strcmp( http_mime[i].psz_ext, psz_ext ) )
- {
- return( http_mime[i].psz_mime );
- }
- }
- }
- return( "application/octet-stream" );
-}
/*****************************************************************************
* Open: open the file
*****************************************************************************/
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;
+ 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 ;
- /* *** parse p_access->psz_name to extract bind address, port and file name *** */
- /* 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( "/" );
}
strcpy( psz_file_name, "/" );
strcat( psz_file_name, p );
}
+ else
+ {
+ psz_file_name = strdup( psz_file_name );
+ }
- p_sys->p_httpd = httpd_Find( VLC_OBJECT(p_access), VLC_TRUE );
- if( !p_sys->p_httpd )
+ /* SSL support */
+ if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) )
{
- msg_Err( p_access, "cannot start httpd daemon" );
+ 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" );
- free( psz_name );
- free( psz_file_name );
- free( p_access );
- return( VLC_EGENERIC );
+ 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 =
- p_sys->p_httpd->pf_register_host( p_sys->p_httpd,
- psz_bind_addr, i_bind_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 );
+ free( psz_cert );
+ free( psz_key );
+ free( psz_ca );
+ free( psz_crl );
- if( !p_sys->p_httpd_host )
+ if( p_sys->p_httpd_host == NULL )
{
- msg_Err( p_access, "cannot listen on %s:%d", psz_bind_addr, i_bind_port );
- httpd_Release( p_sys->p_httpd );
-
- free( psz_name );
+ msg_Err( p_access, "cannot listen on %s:%d",
+ psz_bind_addr, i_bind_port );
free( psz_file_name );
- free( p_access );
- return( VLC_EGENERIC );
+ 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 = 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 =
- p_sys->p_httpd->pf_register_stream( p_sys->p_httpd,
- psz_file_name,
- GetMime( psz_file_name ),
- NULL, NULL );
+ httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
+ psz_user, psz_pwd, NULL );
+ free( psz_user );
+ free( psz_pwd );
+ free( psz_mime );
- if( !p_sys->p_httpd_stream )
+ if( p_sys->p_httpd_stream == NULL )
{
msg_Err( p_access, "cannot add stream %s", psz_file_name );
- p_sys->p_httpd->pf_unregister_host( p_sys->p_httpd, p_sys->p_httpd_host );
- httpd_Release( p_sys->p_httpd );
+ httpd_HostDelete( p_sys->p_httpd_host );
- free( psz_name );
free( psz_file_name );
- free( p_access );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
- 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 );
+
+ 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;
+
+ if( psz_file_name &&
+ asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 )
+ {
+ pl_Release( p_access );
+ 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 );
+ free( psz_uri );
+ free( (void *)psz_txt );
+
+ if( p_sys->p_bonjour == NULL )
+ msg_Err( p_access, "unable to start requested Bonjour announce" );
+ pl_Release( p_access );
}
+ 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 );
- p_sys->b_header_complete = VLC_FALSE;
+ p_sys->b_header_complete = false;
p_access->pf_write = Write;
p_access->pf_seek = Seek;
+
+ /* update p_sout->i_out_pace_nocontrol */
+ p_access->p_sout->i_out_pace_nocontrol++;
+
return VLC_SUCCESS;
}
sout_access_out_t *p_access = (sout_access_out_t*)p_this;
sout_access_out_sys_t *p_sys = p_access->p_sys;
- p_sys->p_httpd->pf_unregister_stream( p_sys->p_httpd, p_sys->p_httpd_stream );
- p_sys->p_httpd->pf_unregister_host( p_sys->p_httpd, p_sys->p_httpd_host );
+#ifdef HAVE_AVAHI_CLIENT
+ if( p_sys->p_bonjour != NULL )
+ bonjour_stop_service( p_sys->p_bonjour );
+#endif
- httpd_Release( p_sys->p_httpd );
+ /* update p_sout->i_out_pace_nocontrol */
+ p_access->p_sout->i_out_pace_nocontrol--;
- FREE( p_sys->p_header );
+ httpd_StreamDelete( p_sys->p_httpd_stream );
+ httpd_HostDelete( p_sys->p_httpd_host );
- msg_Info( p_access, "Close" );
+ free( p_sys->p_header );
+
+ msg_Dbg( p_access, "Close" );
free( p_sys );
}
/*****************************************************************************
* Write:
*****************************************************************************/
-static int Write( sout_access_out_t *p_access, sout_buffer_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;
+ sout_access_out_sys_t *p_sys = p_access->p_sys;
int i_err = 0;
+ int i_len = 0;
while( p_buffer )
{
- sout_buffer_t *p_next;
+ block_t *p_next;
- if( p_buffer->i_flags & SOUT_BUFFER_FLAGS_HEADER )
+ if( p_buffer->i_flags & BLOCK_FLAG_HEADER )
{
/* gather header */
if( p_sys->b_header_complete )
{
/* free previously gathered header */
p_sys->i_header_size = 0;
- p_sys->b_header_complete = VLC_FALSE;
+ p_sys->b_header_complete = false;
}
- if( p_buffer->i_size + p_sys->i_header_size > p_sys->i_header_allocated )
+ if( (int)(p_buffer->i_buffer + p_sys->i_header_size) >
+ p_sys->i_header_allocated )
{
- p_sys->i_header_allocated = p_buffer->i_size + p_sys->i_header_size + 1024;
- p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header_allocated );
+ p_sys->i_header_allocated =
+ p_buffer->i_buffer + p_sys->i_header_size + 1024;
+ p_sys->p_header =
+ realloc( p_sys->p_header, p_sys->i_header_allocated );
}
memcpy( &p_sys->p_header[p_sys->i_header_size],
p_buffer->p_buffer,
- p_buffer->i_size );
- p_sys->i_header_size += p_buffer->i_size;
+ p_buffer->i_buffer );
+ p_sys->i_header_size += p_buffer->i_buffer;
}
else if( !p_sys->b_header_complete )
{
- p_sys->b_header_complete = VLC_TRUE;
+ p_sys->b_header_complete = true;
- p_sys->p_httpd->pf_header_stream( p_sys->p_httpd,
- p_sys->p_httpd_stream,
- p_sys->p_header, p_sys->i_header_size );
+ httpd_StreamHeader( p_sys->p_httpd_stream, p_sys->p_header,
+ p_sys->i_header_size );
}
- /* send data */
- i_err = p_sys->p_httpd->pf_send_stream( p_sys->p_httpd, p_sys->p_httpd_stream,
- p_buffer->p_buffer, p_buffer->i_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 );
p_next = p_buffer->p_next;
- sout_BufferDelete( p_access->p_sout, p_buffer );
+ block_Release( p_buffer );
p_buffer = p_next;
if( i_err < 0 )
if( i_err < 0 )
{
- sout_buffer_t *p_next;
- while( p_buffer )
- {
- p_next = p_buffer->p_next;
- sout_BufferDelete( p_access->p_sout, p_buffer );
- p_buffer = p_next;
- }
+ block_ChainRelease( p_buffer );
}
- return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
+ return( i_err < 0 ? VLC_EGENERIC : i_len );
}
/*****************************************************************************
*****************************************************************************/
static int Seek( sout_access_out_t *p_access, off_t i_pos )
{
- msg_Err( p_access, "http sout access cannot seek" );
- return( VLC_EGENERIC );
+ msg_Warn( p_access, "HTTP sout access cannot seek" );
+ return VLC_EGENERIC;
}
-
projects / vlc / blobdiff