X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=86c7745209ac3208eba141dc6028faa489597cae;hb=f9e4aada6337d7c419c8a7d36e359626a39a4390;hp=ec18c72ce44d49dd8285c3220ce76b9e4e5af7ae;hpb=6da90a1716250d282f16dc6bc9dacec5b9514caf;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index ec18c72ce4..86c7745209 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -27,7 +27,7 @@ # include "config.h" #endif -#include +#include #include #ifdef ENABLE_HTTPD @@ -394,7 +394,6 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, 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; @@ -431,6 +430,7 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, /* 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 ) @@ -520,7 +520,6 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, 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 ) @@ -536,6 +535,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, 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, @@ -989,21 +989,15 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, psz_host = strdup( psz_hostname ); if( psz_host == NULL ) - { - msg_Err( p_this, "memory error" ); return 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), @@ -1020,7 +1014,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, 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 ); } @@ -1072,7 +1066,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, /* create the new host */ host = (httpd_host_t *)vlc_custom_create( p_this, sizeof (*host), - VLC_OBJECT_HTTPD_HOST, + VLC_OBJECT_GENERIC, psz_object_type ); if (host == NULL) goto error; @@ -1197,12 +1191,9 @@ void httpd_HostDelete( httpd_host_t *host ) 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 ); @@ -1463,26 +1454,32 @@ static httpd_client_t *httpd_ClientNew( int fd, tls_session_t *p_tls, mtime_t no return cl; } -static int httpd_NetRecv( httpd_client_t *cl, uint8_t *p, int i_len ) +static +ssize_t httpd_NetRecv (httpd_client_t *cl, uint8_t *p, size_t i_len) { tls_session_t *p_tls; + ssize_t val; p_tls = cl->p_tls; - if( p_tls != NULL) - return tls_Recv( p_tls, p, i_len ); - - return recv( cl->fd, p, i_len, 0 ); + do + val = p_tls ? tls_Recv (p_tls, p, i_len) + : recv (cl->fd, p, i_len, 0); + while (val == -1 && errno == EINTR); + return val; } -static int httpd_NetSend( httpd_client_t *cl, const uint8_t *p, int i_len ) +static +ssize_t httpd_NetSend (httpd_client_t *cl, const uint8_t *p, size_t i_len) { tls_session_t *p_tls; + ssize_t val; p_tls = cl->p_tls; - if( p_tls != NULL) - return tls_Send( p_tls, p, i_len ); - - return send( cl->fd, p, i_len, 0 ); + do + val = p_tls ? tls_Send( p_tls, p, i_len ) + : send (cl->fd, p, i_len, 0); + while (val == -1 && errno == EINTR); + return val; } @@ -1836,7 +1833,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) #if defined( WIN32 ) || defined( UNDER_CE ) if( ( i_len < 0 && WSAGetLastError() != WSAEWOULDBLOCK ) || ( i_len == 0 ) ) #else - if( ( i_len < 0 && errno != EAGAIN && errno != EINTR ) || ( i_len == 0 ) ) + if( ( i_len < 0 && errno != EAGAIN ) || ( i_len == 0 ) ) #endif { if( cl->query.i_proto != HTTPD_PROTO_NONE && cl->query.i_type != HTTPD_MSG_NONE ) @@ -1976,7 +1973,7 @@ static void httpd_ClientSend( httpd_client_t *cl ) #if defined( WIN32 ) || defined( UNDER_CE ) if( ( i_len < 0 && WSAGetLastError() != WSAEWOULDBLOCK ) || ( i_len == 0 ) ) #else - if( ( i_len < 0 && errno != EAGAIN && errno != EINTR ) || ( i_len == 0 ) ) + if( ( i_len < 0 && errno != EAGAIN ) || ( i_len == 0 ) ) #endif { /* error */ @@ -2030,6 +2027,7 @@ static void httpd_HostThread( httpd_host_t *host ) int evfd; bool b_die; +retry: vlc_object_lock( host ); evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); b_die = !vlc_object_alive( host ); @@ -2041,7 +2039,7 @@ static void httpd_HostThread( httpd_host_t *host ) { /* 0.2s (FIXME: use a condition variable) */ msleep( 200000 ); - continue; + goto retry; } /* prepare a new TLS session */ @@ -2458,7 +2456,7 @@ static void httpd_HostThread( httpd_host_t *host ) { b_die = !vlc_object_alive( host ); if( !b_die ) - b_die = vlc_object_wait( host ); + vlc_object_wait( host ); } vlc_object_unlock( host );