}
static const char psz_object_type[] = "http server";
+static vlc_mutex_t httpd_mutex = VLC_STATIC_MUTEX;
httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
int i_port,
httpd_host_t *host;
tls_server_t *p_tls;
char *psz_host;
- vlc_value_t lockval, ptrval;
+ vlc_value_t ptrval;
int i;
if( psz_hostname == NULL )
return NULL;
/* to be sure to avoid multiple creation */
- var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "httpd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( &httpd_mutex );
httpd = libvlc_priv (p_this->p_libvlc)->p_httpd;
if( httpd == NULL )
psz_object_type );
if( httpd == NULL )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
free( psz_host );
return NULL;
}
host->i_ref++;
vlc_mutex_unlock( &host->lock );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
return host;
}
/* now add it to httpd */
TAB_APPEND( httpd->i_host, httpd->host, host );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
return host;
vlc_object_detach( httpd );
vlc_object_release( httpd );
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
if( host != NULL )
{
void httpd_HostDelete( httpd_host_t *host )
{
httpd_t *httpd = host->httpd;
- vlc_value_t lockval;
int i;
- var_Get( httpd->p_libvlc, "httpd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( &httpd_mutex );
vlc_mutex_lock( &host->lock );
host->i_ref--;
if( host->i_ref > 0 )
{
/* still used */
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
msg_Dbg( host, "httpd_HostDelete: host still used" );
return;
}
vlc_object_release( httpd );
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd_mutex );
}
/* register a new url */