#endif
#endif
-#include "vlc_httpd.h"
+#include <vlc_httpd.h>
#define DEFAULT_PORT 8080
#define DEFAULT_SSL_PORT 8443
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 ) ) ) )
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;
}
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 );
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;
{
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,