# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_httpd.h>
#ifdef ENABLE_HTTPD
httpd_message_t *answer, const httpd_message_t *query )
{
httpd_file_t *file = (httpd_file_t*)p_sys;
- uint8_t *psz_args = query->psz_args;
uint8_t **pp_body, *p_body;
const char *psz_connection;
int *pi_body, i_body;
/* msg_Warn not supported */
}
+ uint8_t *psz_args = query->psz_args;
file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
httpd_message_t *answer, const httpd_message_t *query )
{
httpd_handler_t *handler = (httpd_handler_t*)p_sys;
- uint8_t *psz_args = query->psz_args;
char psz_remote_addr[NI_MAXNUMERICHOST];
if( answer == NULL || query == NULL )
if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
*psz_remote_addr = '\0';
+ uint8_t *psz_args = query->psz_args;
handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args,
query->i_type, query->p_body, query->i_body,
psz_remote_addr, NULL,
/* to be sure to avoid multiple creation */
var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
- var_Create( p_this->p_libvlc, "httpd_object", VLC_VAR_ADDRESS );
var_Get( p_this->p_libvlc, "httpd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
- var_Get( p_this->p_libvlc, "httpd_object", &ptrval );
+ httpd = libvlc_priv (p_this->p_libvlc)->p_httpd;
- if( ptrval.p_address != NULL )
- httpd = ptrval.p_address;
- else
+ if( httpd == NULL )
{
msg_Info( p_this, "creating httpd" );
httpd = (httpd_t *)vlc_custom_create( p_this, sizeof (*httpd),
httpd->host = NULL;
ptrval.p_address = httpd;
- var_Set( p_this->p_libvlc, "httpd_object", ptrval );
+ libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
vlc_object_yield( httpd );
vlc_object_attach( httpd, p_this->p_libvlc );
}
vlc_object_release( httpd );
if( httpd->i_host <= 0 )
{
- vlc_value_t ptrval;
-
msg_Dbg( httpd, "no host left, stopping httpd" );
- ptrval.p_address = NULL;
- var_Set( httpd->p_libvlc, "httpd_object", ptrval );
+ libvlc_priv (httpd->p_libvlc)->p_httpd = NULL;
vlc_object_detach( httpd );
vlc_object_release( httpd );
int evfd;
bool b_die;
+retry:
vlc_object_lock( host );
evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
b_die = !vlc_object_alive( host );
{
/* 0.2s (FIXME: use a condition variable) */
msleep( 200000 );
- continue;
+ goto retry;
}
/* prepare a new TLS session */
{
b_die = !vlc_object_alive( host );
if( !b_die )
- b_die = vlc_object_wait( host );
+ vlc_object_wait( host );
}
vlc_object_unlock( host );