X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fhttp.c;h=6b13455e452bd691b8bcd93bffed099f425588e8;hb=9af91c9f1bf815bde7783f1de90ab481f1bc9453;hp=5644352ff4ca1918917b586836182c96a7c41098;hpb=05492281965ed211badf7e1f4c2220be720d3356;p=vlc diff --git a/modules/access_output/http.c b/modules/access_output/http.c index 5644352ff4..6b13455e45 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -1,7 +1,7 @@ /***************************************************************************** * http.c ***************************************************************************** - * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2001-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -39,7 +39,7 @@ #include #include -#ifdef HAVE_AVAHI_CLIENT +#if 0 //def HAVE_AVAHI_CLIENT #include "bonjour.h" #if defined( WIN32 ) @@ -49,7 +49,7 @@ #endif #endif -#include "vlc_httpd.h" +#include #define DEFAULT_PORT 8080 #define DEFAULT_SSL_PORT 8443 @@ -95,27 +95,27 @@ vlc_module_begin () set_description( N_("HTTP stream output") ) set_capability( "sout access", 0 ) set_shortname( "HTTP" ) - add_shortcut( "http" ) - add_shortcut( "https" ) - add_shortcut( "mmsh" ) + add_shortcut( "http", "https", "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 ); + USER_TEXT, USER_LONGTEXT, true ) + add_password( SOUT_CFG_PREFIX "pwd", "", NULL, + PASS_TEXT, PASS_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mime", "", NULL, - MIME_TEXT, MIME_LONGTEXT, true ); + MIME_TEXT, MIME_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, - CERT_TEXT, CERT_LONGTEXT, true ); + CERT_TEXT, CERT_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "key", NULL, NULL, - KEY_TEXT, KEY_LONGTEXT, true ); + KEY_TEXT, KEY_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, - CA_TEXT, CA_LONGTEXT, true ); + CA_TEXT, CA_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, - CRL_TEXT, CRL_LONGTEXT, true ); + CRL_TEXT, CRL_LONGTEXT, true ) +#if 0 //def HAVE_AVAHI_CLIENT add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL, BONJOUR_TEXT, BONJOUR_LONGTEXT, true); +#endif set_callbacks( Open, Close ) vlc_module_end () @@ -145,7 +145,7 @@ struct sout_access_out_sys_t uint8_t *p_header; bool b_header_complete; -#ifdef HAVE_AVAHI_CLIENT +#if 0 //def HAVE_AVAHI_CLIENT void *p_bonjour; #endif }; @@ -163,12 +163,11 @@ static int Open( vlc_object_t *p_this ) 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_user; + char *psz_pwd; + char *psz_mime; 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 ) ) ) ) @@ -177,7 +176,7 @@ static int Open( vlc_object_t *p_this ) 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 = strdup( p_access->psz_path ); i_bind_port = 0; @@ -215,10 +214,10 @@ static int Open( vlc_object_t *p_this ) /* 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" ); + psz_cert = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"cert" ); + psz_key = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"key" ); + psz_ca = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"ca" ); + psz_crl = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"crl" ); if( i_bind_port <= 0 ) i_bind_port = DEFAULT_SSL_PORT; @@ -249,31 +248,17 @@ static int Open( vlc_object_t *p_this ) } free( psz_parser ); + psz_user = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "user" ); + psz_pwd = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "pwd" ); 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 ); + psz_mime = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "mime" ); } - 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, psz_user, psz_pwd, NULL ); @@ -292,10 +277,10 @@ static int Open( vlc_object_t *p_this ) } #if 0 //def HAVE_AVAHI_CLIENT - if( config_GetInt(p_this, SOUT_CFG_PREFIX "bonjour") ) + if( var_InheritBool(p_this, SOUT_CFG_PREFIX "bonjour") ) { char *psz_txt, *psz_name; - playlist_t *p_playlist = pl_Hold( p_access ); + playlist_t *p_playlist = pl_Get( p_access ); char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input ); char *psz_newuri = psz_uri; @@ -306,7 +291,6 @@ static int Open( vlc_object_t *p_this ) if( psz_file_name && asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 ) { - pl_Release( p_access ); free( psz_uri ); return VLC_ENOMEM; } @@ -320,7 +304,6 @@ static int Open( vlc_object_t *p_this ) 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; @@ -330,7 +313,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_header_allocated = 1024; p_sys->i_header_size = 0; - p_sys->p_header = malloc( p_sys->i_header_allocated ); + p_sys->p_header = xmalloc( p_sys->i_header_allocated ); p_sys->b_header_complete = false; p_access->pf_write = Write; @@ -348,7 +331,7 @@ static void Close( vlc_object_t * p_this ) 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 0 //def HAVE_AVAHI_CLIENT if( p_sys->p_bonjour != NULL ) bonjour_stop_service( p_sys->p_bonjour ); #endif @@ -406,8 +389,8 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) { 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 ); + p_sys->p_header = xrealloc( p_sys->p_header, + p_sys->i_header_allocated ); } memcpy( &p_sys->p_header[p_sys->i_header_size], p_buffer->p_buffer,