* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <vlc_input.h>
#include <vlc_playlist.h>
#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." )
-
+ "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." )
"user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
};
-static int Write( sout_access_out_t *, block_t * );
+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
p_sys->p_httpd_stream =
httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
psz_user, psz_pwd, NULL );
- if( psz_user ) free( psz_user );
- if( psz_pwd ) free( psz_pwd );
- if( psz_mime ) free( psz_mime );
+ free( psz_user );
+ free( psz_pwd );
+ free( psz_mime );
if( p_sys->p_httpd_stream == NULL )
{
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 );
+ 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 = p_playlist->status.p_item->p_input->psz_uri;
+ else psz_name = psz_newuri;
- asprintf( &psz_txt, "path=%s", psz_file_name );
+ if( psz_file_name &&
+ asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 )
+ {
+ pl_Release( p_playlist );
+ 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" );
- vlc_object_release( p_playlist );
+ pl_Release( p_playlist );
}
else
p_sys->p_bonjour = NULL;
httpd_StreamDelete( p_sys->p_httpd_stream );
httpd_HostDelete( p_sys->p_httpd_host );
- FREE( p_sys->p_header );
+ free( p_sys->p_header );
msg_Dbg( p_access, "Close" );
/*****************************************************************************
* Write:
*****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_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;
int i_err = 0;