X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=2e95eedc38ffd0d352de06c6e87bc50101db38dc;hb=9f1c2185529eec1eb422acd60800c6bca8d66983;hp=f710612753bf9b6c3c3e91dcc7819d7c66a1287f;hpb=b1a9a82e38f91f51859c7f87eee3695715ab0c5b;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index f710612753..2e95eedc38 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -23,17 +23,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#ifdef ENABLE_HTTPD +#include +#include #include -#include #include #include #include #include +#include #include "../libvlc.h" #include @@ -43,10 +46,6 @@ # include #endif -#ifdef HAVE_FCNTL_H -# include -#endif - #ifdef HAVE_POLL # include #endif @@ -85,7 +84,7 @@ struct httpd_host_t httpd_t *httpd; /* ref count */ - int i_ref; + unsigned i_ref; /* address/port and socket for listening at connections */ char *psz_hostname; @@ -93,7 +92,9 @@ struct httpd_host_t int *fds; unsigned nfd; + vlc_thread_t thread; vlc_mutex_t lock; + vlc_cond_t wait; /* all registered url (becarefull that 2 httpd_url_t could point at the same url) * This will slow down the url research but make my live easier @@ -185,7 +186,7 @@ struct httpd_client_t /***************************************************************************** * Various functions *****************************************************************************/ -static struct +static const struct { const char psz_ext[8]; const char *psz_mime; @@ -205,7 +206,8 @@ static struct { ".jpg", "image/jpeg" }, { ".jpeg", "image/jpeg" }, { ".png", "image/png" }, - { ".mpjpeg","multipart/x-mixed-replace; boundary=This Random String" }, + /* same as modules/mux/mpjpeg.c here: */ + { ".mpjpeg","multipart/x-mixed-replace; boundary=7b3cc56e5f51db803f790dad720ed50a" }, /* media mime */ { ".avi", "video/avi" }, @@ -222,8 +224,12 @@ static struct { ".mpe", "video/mpeg" }, { ".mov", "video/quicktime" }, { ".moov", "video/quicktime" }, + { ".oga", "audio/ogg" }, { ".ogg", "application/ogg" }, { ".ogm", "application/ogg" }, + { ".ogv", "video/ogg" }, + { ".ogx", "application/ogg" }, + { ".spx", "audio/ogg" }, { ".wav", "audio/wav" }, { ".wma", "audio/x-ms-wma" }, { ".wmv", "video/x-ms-wmv" }, @@ -357,7 +363,7 @@ static size_t httpd_HtmlError (char **body, int code, const char *url) "VideoLAN\n" "\n" "\n", errname, code, errname, - (url ? " (" : ""), (url ?: ""), (url ? ")" : "")); + (url ? " (" : ""), (url ? url : ""), (url ? ")" : "")); if (res == -1) { @@ -389,7 +395,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; @@ -426,6 +431,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 ) @@ -451,7 +457,7 @@ httpd_file_t *httpd_FileNew( httpd_host_t *host, const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill, httpd_file_sys_t *p_sys ) { - httpd_file_t *file = malloc( sizeof( httpd_file_t ) ); + httpd_file_t *file = xmalloc( sizeof( httpd_file_t ) ); if( ( file->url = httpd_UrlNewUnique( host, psz_url, psz_user, psz_password, p_acl ) @@ -515,7 +521,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 ) @@ -531,6 +536,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, @@ -554,7 +560,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, { p[4] = '\0'; answer->i_body = strlen((char*)answer->p_body) + 1; - answer->p_body = realloc( answer->p_body, answer->i_body ); + answer->p_body = xrealloc( answer->p_body, answer->i_body ); } } @@ -568,8 +574,8 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, { /* Apache-style */ i_status = strtol( (char *)&answer->p_body[8], &psz_headers, 0 ); - if( *psz_headers ) psz_headers++; - if( *psz_headers ) psz_headers++; + if( *psz_headers == '\r' || *psz_headers == '\n' ) psz_headers++; + if( *psz_headers == '\n' ) psz_headers++; i_headers = answer->i_body - (psz_headers - (char *)answer->p_body); } else @@ -582,7 +588,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, psz_status = httpd_ReasonFromCode( i_status ); answer->i_body = sizeof("HTTP/1.0 xxx \r\n") + strlen(psz_status) + i_headers - 1; - psz_new = (char *)malloc( answer->i_body + 1); + psz_new = (char *)xmalloc( answer->i_body + 1); sprintf( psz_new, "HTTP/1.0 %03d %s\r\n", i_status, psz_status ); memcpy( &psz_new[strlen(psz_new)], psz_headers, i_headers ); free( answer->p_body ); @@ -599,7 +605,7 @@ httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url, httpd_handler_callback_t pf_fill, httpd_handler_sys_t *p_sys ) { - httpd_handler_t *handler = malloc( sizeof( httpd_handler_t ) ); + httpd_handler_t *handler = xmalloc( sizeof( httpd_handler_t ) ); if( ( handler->url = httpd_UrlNewUnique( host, psz_url, psz_user, psz_password, p_acl ) @@ -670,7 +676,7 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys, httpd_redirect_t *httpd_RedirectNew( httpd_host_t *host, const char *psz_url_dst, const char *psz_url_src ) { - httpd_redirect_t *rdir = malloc( sizeof( httpd_redirect_t ) ); + httpd_redirect_t *rdir = xmalloc( sizeof( httpd_redirect_t ) ); if( !( rdir->url = httpd_UrlNewUnique( host, psz_url_src, NULL, NULL, NULL ) ) ) { @@ -776,7 +782,7 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, answer->i_type = HTTPD_MSG_ANSWER; answer->i_body = i_write; - answer->p_body = malloc( i_write ); + answer->p_body = xmalloc( i_write ); memcpy( answer->p_body, &stream->p_buffer[i_pos], i_write ); answer->i_body_offset += i_write; @@ -799,7 +805,7 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, if( stream->i_header > 0 ) { answer->i_body = stream->i_header; - answer->p_body = malloc( stream->i_header ); + answer->p_body = xmalloc( stream->i_header ); memcpy( answer->p_body, stream->p_header, stream->i_header ); } answer->i_body_offset = stream->i_buffer_last_pos; @@ -813,14 +819,15 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, if( !strcmp( stream->psz_mime, "video/x-ms-asf-stream" ) ) { - vlc_bool_t b_xplaystream = VLC_FALSE; + bool b_xplaystream = false; int i; httpd_MsgAdd( answer, "Content-type", "%s", "application/octet-stream" ); httpd_MsgAdd( answer, "Server", "Cougar 4.1.0.3921" ); httpd_MsgAdd( answer, "Pragma", "no-cache" ); - httpd_MsgAdd( answer, "Pragma", "client-id=%d", rand()&0x7fff ); + httpd_MsgAdd( answer, "Pragma", "client-id=%lu", + vlc_mrand48()&0x7fff ); httpd_MsgAdd( answer, "Pragma", "features=\"broadcast\"" ); /* Check if there is a xPlayStrm=1 */ @@ -829,7 +836,7 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, if( !strcasecmp( query->name[i], "Pragma" ) && strstr( query->value[i], "xPlayStrm=1" ) ) { - b_xplaystream = VLC_TRUE; + b_xplaystream = true; } } @@ -852,7 +859,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) { - httpd_stream_t *stream = malloc( sizeof( httpd_stream_t ) ); + httpd_stream_t *stream = xmalloc( sizeof( httpd_stream_t ) ); if( ( stream->url = httpd_UrlNewUnique( host, psz_url, psz_user, psz_password, p_acl ) @@ -861,7 +868,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, free( stream ); return NULL; } - vlc_mutex_init( host, &stream->lock ); + vlc_mutex_init( &stream->lock ); if( psz_mime && *psz_mime ) { stream->psz_mime = strdup( psz_mime ); @@ -873,7 +880,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, stream->i_header = 0; stream->p_header = NULL; stream->i_buffer_size = 5000000; /* 5 Mo per stream */ - stream->p_buffer = malloc( stream->i_buffer_size ); + stream->p_buffer = xmalloc( stream->i_buffer_size ); /* We set to 1 to make life simpler * (this way i_body_offset can never be 0) */ stream->i_buffer_pos = 1; @@ -892,15 +899,13 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, int httpd_StreamHeader( httpd_stream_t *stream, uint8_t *p_data, int i_data ) { vlc_mutex_lock( &stream->lock ); - if( stream->p_header ) - { - free( stream->p_header ); - stream->p_header = NULL; - } + free( stream->p_header ); + stream->p_header = NULL; + stream->i_header = i_data; if( i_data > 0 ) { - stream->p_header = malloc( i_data ); + stream->p_header = xmalloc( i_data ); memcpy( stream->p_header, p_data, i_data ); } vlc_mutex_unlock( &stream->lock ); @@ -948,16 +953,16 @@ void httpd_StreamDelete( httpd_stream_t *stream ) { httpd_UrlDelete( stream->url ); vlc_mutex_destroy( &stream->lock ); - if( stream->psz_mime ) free( stream->psz_mime ); - if( stream->p_header ) free( stream->p_header ); - if( stream->p_buffer ) free( stream->p_buffer ); + free( stream->psz_mime ); + free( stream->p_header ); + free( stream->p_buffer ); free( stream ); } /***************************************************************************** * Low level *****************************************************************************/ -static void httpd_HostThread( httpd_host_t * ); +static void* httpd_HostThread( void * ); /* create a new host */ httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host, @@ -968,6 +973,7 @@ httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host, } 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, @@ -978,7 +984,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, httpd_host_t *host; tls_server_t *p_tls; char *psz_host; - vlc_value_t lockval; + vlc_value_t ptrval; int i; if( psz_hostname == NULL ) @@ -986,25 +992,21 @@ 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_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 = vlc_object_find( p_this, VLC_OBJECT_HTTPD, FIND_ANYWHERE )) ) + if( httpd == NULL ) { msg_Info( p_this, "creating httpd" ); httpd = (httpd_t *)vlc_custom_create( p_this, sizeof (*httpd), - VLC_OBJECT_HTTPD, + VLC_OBJECT_GENERIC, psz_object_type ); - if (httpd == NULL) + if( httpd == NULL ) { - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); free( psz_host ); return NULL; } @@ -1012,7 +1014,8 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, httpd->i_host = 0; httpd->host = NULL; - vlc_object_yield( httpd ); + ptrval.p_address = httpd; + libvlc_priv (p_this->p_libvlc)->p_httpd = httpd; vlc_object_attach( httpd, p_this->p_libvlc ); } @@ -1027,10 +1030,15 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, || strcmp( host->psz_hostname, psz_hostname ) ) continue; - /* yep found */ + /* Increase existing matching host reference count. + * The reference count is written under both the global httpd and the + * host lock. It is read with either or both locks held. The global + * lock is always acquired first. */ + vlc_mutex_lock( &host->lock ); host->i_ref++; + vlc_mutex_unlock( &host->lock ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); return host; } @@ -1063,24 +1071,18 @@ 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; - vlc_object_lock( host ); - if( vlc_object_waitpipe( VLC_OBJECT( host ) ) == -1 ) - { - msg_Err( host, "signaling pipe error: %m" ); - vlc_object_unlock( host ); - goto error; - } - vlc_object_unlock( host ); - host->httpd = httpd; - vlc_mutex_init( httpd, &host->lock ); + vlc_mutex_init( &host->lock ); + vlc_cond_init( &host->wait ); host->i_ref = 1; + vlc_object_attach( host, p_this ); + host->fds = net_ListenTCP( p_this, psz_host, i_port ); if( host->fds == NULL ) { @@ -1089,6 +1091,12 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, } for (host->nfd = 0; host->fds[host->nfd] != -1; host->nfd++); + if( vlc_object_waitpipe( VLC_OBJECT( host ) ) == -1 ) + { + msg_Err( host, "signaling pipe error: %m" ); + goto error; + } + host->i_port = i_port; host->psz_hostname = psz_host; @@ -1100,8 +1108,8 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, host->p_tls = p_tls; /* create the thread */ - if( vlc_thread_create( host, "httpd host thread", httpd_HostThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + if( vlc_clone( &host->thread, httpd_HostThread, host, + VLC_THREAD_PRIORITY_LOW ) ) { msg_Err( p_this, "cannot spawn http host thread" ); goto error; @@ -1109,7 +1117,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, /* 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; @@ -1117,17 +1125,17 @@ error: free( psz_host ); if( httpd->i_host <= 0 ) { + libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; vlc_object_release( httpd ); - vlc_object_detach( httpd ); - vlc_object_destroy( httpd ); } - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); if( host != NULL ) { net_ListenClose( host->fds ); + vlc_cond_destroy( &host->wait ); vlc_mutex_destroy( &host->lock ); - vlc_object_destroy( host ); + vlc_object_release( host ); } if( p_tls != NULL ) @@ -1140,24 +1148,30 @@ error: void httpd_HostDelete( httpd_host_t *host ) { httpd_t *httpd = host->httpd; - vlc_value_t lockval; int i; + bool delete = false; - 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 ) + if( host->i_ref == 0 ) + { + vlc_cond_signal( &host->wait ); + delete = true; + } + vlc_mutex_unlock( &host->lock ); + if( !delete ) { /* still used */ - vlc_mutex_unlock( lockval.p_address ); - msg_Dbg( host, "httpd_HostDelete: host still used" ); + vlc_mutex_unlock( &httpd_mutex ); + msg_Dbg( host, "httpd_HostDelete: host still in use" ); return; } TAB_REMOVE( httpd->i_host, httpd->host, host ); vlc_object_kill( host ); - vlc_thread_join( host ); + vlc_join( host->thread, NULL ); msg_Dbg( host, "HTTP host removed" ); @@ -1182,23 +1196,24 @@ void httpd_HostDelete( httpd_host_t *host ) net_ListenClose( host->fds ); free( host->psz_hostname ); + vlc_cond_destroy( &host->wait ); vlc_mutex_destroy( &host->lock ); - vlc_object_destroy( host ); + vlc_object_release( host ); - vlc_object_release( httpd ); if( httpd->i_host <= 0 ) { - msg_Dbg( httpd, "no host left, stopping httpd" ); - vlc_object_detach( httpd ); - vlc_object_destroy( httpd ); + msg_Dbg( httpd, "no hosts left, stopping httpd" ); + + libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; + vlc_object_release( httpd ); } - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); } /* register a new url */ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url, const char *psz_user, const char *psz_password, - const vlc_acl_t *p_acl, vlc_bool_t b_check ) + const vlc_acl_t *p_acl, bool b_check ) { httpd_url_t *url; int i; @@ -1220,10 +1235,10 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url } } - url = malloc( sizeof( httpd_url_t ) ); + url = xmalloc( sizeof( httpd_url_t ) ); url->host = host; - vlc_mutex_init( host->httpd, &url->lock ); + vlc_mutex_init( &url->lock ); url->psz_url = strdup( psz_url ); url->psz_user = strdup( psz_user ? psz_user : "" ); url->psz_password = strdup( psz_password ? psz_password : "" ); @@ -1235,6 +1250,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url } TAB_APPEND( host->i_url, host->url, url ); + vlc_cond_signal( &host->wait ); vlc_mutex_unlock( &host->lock ); return url; @@ -1245,7 +1261,7 @@ httpd_url_t *httpd_UrlNew( httpd_host_t *host, const char *psz_url, const vlc_acl_t *p_acl ) { return httpd_UrlNewPrivate( host, psz_url, psz_user, - psz_password, p_acl, VLC_FALSE ); + psz_password, p_acl, false ); } httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url, @@ -1253,7 +1269,7 @@ httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url, const vlc_acl_t *p_acl ) { return httpd_UrlNewPrivate( host, psz_url, psz_user, - psz_password, p_acl, VLC_TRUE ); + psz_password, p_acl, true ); } /* register callback on a url */ @@ -1301,7 +1317,7 @@ void httpd_UrlDelete( httpd_url_t *url ) vlc_mutex_unlock( &host->lock ); } -void httpd_MsgInit( httpd_message_t *msg ) +static void httpd_MsgInit( httpd_message_t *msg ) { msg->cl = NULL; msg->i_type = HTTPD_MSG_NONE; @@ -1325,35 +1341,20 @@ void httpd_MsgInit( httpd_message_t *msg ) msg->p_body = NULL; } -void httpd_MsgClean( httpd_message_t *msg ) +static void httpd_MsgClean( httpd_message_t *msg ) { int i; - if( msg->psz_url ) - { - free( msg->psz_url ); - } - if( msg->psz_args ) - { - free( msg->psz_args ); - } + free( msg->psz_url ); + free( msg->psz_args ); for( i = 0; i < msg->i_name; i++ ) { free( msg->name[i] ); free( msg->value[i] ); } - if( msg->name ) - { - free( msg->name ); - } - if( msg->value ) - { - free( msg->value ); - } - if( msg->p_body ) - { - free( msg->p_body ); - } + free( msg->name ); + free( msg->value ); + free( msg->p_body ); httpd_MsgInit( msg ); } @@ -1399,12 +1400,12 @@ static void httpd_ClientInit( httpd_client_t *cl, mtime_t now ) { cl->i_state = HTTPD_CLIENT_RECEIVING; cl->i_activity_date = now; - cl->i_activity_timeout = I64C(10000000); + cl->i_activity_timeout = INT64_C(10000000); cl->i_buffer_size = HTTPD_CL_BUFSIZE; cl->i_buffer = 0; - cl->p_buffer = malloc( cl->i_buffer_size ); + cl->p_buffer = xmalloc( cl->i_buffer_size ); cl->i_mode = HTTPD_CLIENT_FILE; - cl->b_read_waiting = VLC_FALSE; + cl->b_read_waiting = false; httpd_MsgInit( &cl->query ); httpd_MsgInit( &cl->answer ); @@ -1443,11 +1444,8 @@ static void httpd_ClientClean( httpd_client_t *cl ) httpd_MsgClean( &cl->answer ); httpd_MsgClean( &cl->query ); - if( cl->p_buffer ) - { - free( cl->p_buffer ); - cl->p_buffer = NULL; - } + free( cl->p_buffer ); + cl->p_buffer = NULL; } static httpd_client_t *httpd_ClientNew( int fd, tls_session_t *p_tls, mtime_t now ) @@ -1466,26 +1464,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; } @@ -1547,7 +1551,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) cl->query.i_type = HTTPD_MSG_CHANNEL; cl->query.i_channel = cl->p_buffer[1]; cl->query.i_body = (cl->p_buffer[2] << 8)|cl->p_buffer[3]; - cl->query.p_body = malloc( cl->query.i_body ); + cl->query.p_body = xmalloc( cl->query.i_body ); cl->i_buffer -= 4; memcpy( cl->query.p_body, cl->p_buffer + 4, cl->i_buffer ); } @@ -1750,12 +1754,16 @@ static void httpd_ClientRecv( httpd_client_t *cl ) { *p2++ = '\0'; } - if( !strncasecmp( p, "rtsp:", 5 ) ) - { - /* for rtsp url, you have rtsp://localhost:port/path */ - p += 5; - while( *p == '/' ) p++; - while( *p && *p != '/' ) p++; + if( !strncasecmp( p, ( cl->query.i_proto + == HTTPD_PROTO_HTTP ) ? "http" : "rtsp", 4 ) + && p[4 + !!strchr( "sS", p[4] )] == ':' ) + { /* Skip hier-part of URL (if present) */ + p = strchr( p, ':' ) + 1; /* skip URI scheme */ + if( !strncmp( p, "//", 2 ) ) /* skip authority */ + { /* see RFC3986 §3.2 */ + p += 2; + while( *p && !strchr( "/?#", *p ) ) p++; + } } cl->query.psz_url = strdup( p ); if( ( p3 = strchr( cl->query.psz_url, '?' ) ) ) @@ -1824,7 +1832,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) /* TODO Mhh, handle the case client will only send a * request and close the connection * to mark and of body (probably only RTSP) */ - cl->query.p_body = malloc( cl->query.i_body ); + cl->query.p_body = xmalloc( cl->query.i_body ); cl->i_buffer = 0; } else @@ -1839,7 +1847,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 ) @@ -1912,7 +1920,7 @@ static void httpd_ClientSend( httpd_client_t *cl ) { cl->i_buffer_size = i_size; free( cl->p_buffer ); - cl->p_buffer = malloc( i_size ); + cl->p_buffer = xmalloc( i_size ); } p = (char *)cl->p_buffer; @@ -1979,7 +1987,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 */ @@ -2025,28 +2033,16 @@ static void httpd_ClientTlsHsOut( httpd_client_t *cl ) } } -static void httpd_HostThread( httpd_host_t *host ) +static void* httpd_HostThread( void *data ) { + httpd_host_t *host = data; tls_session_t *p_tls = NULL; counter_t *p_total_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER ); counter_t *p_active_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER ); - int evfd; - vlc_bool_t b_die; - - vlc_object_lock( host ); - evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); - b_die = !vlc_object_alive( host ); - vlc_object_unlock( host ); + int evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); - while( !b_die ) + for( ;; ) { - if( host->i_url <= 0 ) - { - /* 0.2s (FIXME: use a condition variable) */ - msleep( 200000 ); - continue; - } - /* prepare a new TLS session */ if( ( p_tls == NULL ) && ( host->p_tls != NULL ) ) p_tls = tls_ServerSessionPrepare( host->p_tls ); @@ -2062,8 +2058,11 @@ static void httpd_HostThread( httpd_host_t *host ) /* add all socket that should be read/write and close dead connection */ vlc_mutex_lock( &host->lock ); + while( host->i_url <= 0 && host->i_ref > 0 ) + vlc_cond_wait( &host->wait, &host->lock ); + mtime_t now = mdate(); - vlc_bool_t b_low_delay = VLC_FALSE; + bool b_low_delay = false; for(int i_client = 0; i_client < host->i_client; i_client++ ) { @@ -2145,7 +2144,7 @@ static void httpd_HostThread( httpd_host_t *host ) answer->i_body = 0; answer->p_body = NULL; - httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING ); + httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION ); httpd_MsgAdd( answer, "Content-Length", "0" ); switch( query->i_proto ) @@ -2212,8 +2211,8 @@ static void httpd_HostThread( httpd_host_t *host ) } else { - vlc_bool_t b_auth_failed = VLC_FALSE; - vlc_bool_t b_hosts_failed = VLC_FALSE; + bool b_auth_failed = false; + bool b_hosts_failed = false; /* Search the url and trigger callbacks */ for(int i = 0; i < host->i_url; i++ ) @@ -2231,7 +2230,7 @@ static void httpd_HostThread( httpd_host_t *host ) if( ( httpd_ClientIP( cl, ip ) == NULL ) || ACL_Check( url->p_acl, ip ) ) { - b_hosts_failed = VLC_TRUE; + b_hosts_failed = true; break; } } @@ -2264,10 +2263,9 @@ static void httpd_HostThread( httpd_host_t *host ) { httpd_MsgAdd( answer, "WWW-Authenticate", - "Basic realm=\"%s\"", - url->psz_user ); + "Basic realm=\"VLC stream\"" ); /* We fail for all url */ - b_auth_failed = VLC_TRUE; + b_auth_failed = true; free( user ); break; } @@ -2337,9 +2335,9 @@ static void httpd_HostThread( httpd_host_t *host ) { const char *psz_connection = httpd_MsgGet( &cl->answer, "Connection" ); const char *psz_query = httpd_MsgGet( &cl->query, "Connection" ); - vlc_bool_t b_connection = VLC_FALSE; - vlc_bool_t b_keepalive = VLC_FALSE; - vlc_bool_t b_query = VLC_FALSE; + bool b_connection = false; + bool b_keepalive = false; + bool b_query = false; cl->url = NULL; if( psz_connection ) @@ -2354,8 +2352,8 @@ static void httpd_HostThread( httpd_host_t *host ) } if( ( ( cl->query.i_proto == HTTPD_PROTO_HTTP ) && - ( ( cl->answer.i_version == 0 && b_keepalive ) || - ( cl->answer.i_version == 1 && !b_connection ) ) ) || + ( ( cl->query.i_version == 0 && b_keepalive ) || + ( cl->query.i_version == 1 && !b_connection ) ) ) || ( ( cl->query.i_proto == HTTPD_PROTO_RTSP ) && !b_query && !b_connection ) ) { @@ -2365,7 +2363,7 @@ static void httpd_HostThread( httpd_host_t *host ) cl->i_buffer = 0; cl->i_buffer_size = 1000; free( cl->p_buffer ); - cl->p_buffer = malloc( cl->i_buffer_size ); + cl->p_buffer = xmalloc( cl->i_buffer_size ); cl->i_state = HTTPD_CLIENT_RECEIVING; } else @@ -2383,9 +2381,9 @@ static void httpd_HostThread( httpd_host_t *host ) cl->i_buffer = 0; cl->i_buffer_size = 1000; free( cl->p_buffer ); - cl->p_buffer = malloc( cl->i_buffer_size ); + cl->p_buffer = xmalloc( cl->i_buffer_size ); cl->i_state = HTTPD_CLIENT_RECEIVING; - cl->b_read_waiting = VLC_FALSE; + cl->b_read_waiting = false; } else { @@ -2433,7 +2431,7 @@ static void httpd_HostThread( httpd_host_t *host ) if (pufd->events != 0) nfd++; else - b_low_delay = VLC_TRUE; + b_low_delay = true; } vlc_mutex_unlock( &host->lock ); @@ -2456,23 +2454,23 @@ static void httpd_HostThread( httpd_host_t *host ) continue; } - vlc_object_lock( host ); if( ufd[nfd - 1].revents ) - b_die = vlc_object_wait( host ); - vlc_object_unlock( host ); + break; /* Handle client sockets */ vlc_mutex_lock( &host->lock ); now = mdate(); + nfd = host->nfd; for( int i_client = 0; i_client < host->i_client; i_client++ ) { httpd_client_t *cl = host->client[i_client]; - const struct pollfd *pufd = &ufd[host->nfd + i_client]; + const struct pollfd *pufd = &ufd[nfd]; assert( pufd < &ufd[sizeof(ufd) / sizeof(ufd[0])] ); if( cl->fd != pufd->fd ) continue; // we were not waiting for this client + ++nfd; if( pufd->revents == 0 ) continue; // no event received @@ -2499,7 +2497,7 @@ static void httpd_HostThread( httpd_host_t *host ) cl->i_state == HTTPD_CLIENT_SENDING && (pufd->revents & POLLIN) ) { - cl->b_read_waiting = VLC_TRUE; + cl->b_read_waiting = true; } } vlc_mutex_unlock( &host->lock ); @@ -2509,17 +2507,19 @@ static void httpd_HostThread( httpd_host_t *host ) { httpd_client_t *cl; int i_state = -1; + int fd = ufd[nfd].fd; - assert (ufd[nfd].fd == host->fds[nfd]); + assert (fd == host->fds[nfd]); if( ufd[nfd].revents == 0 ) continue; /* */ - int kludge[] = { ufd[nfd].fd, -1 }; - int fd = net_Accept( host, kludge, 0 ); - if( fd < 0 ) + fd = vlc_accept (fd, NULL, NULL, true); + if (fd == -1) continue; + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, + &(int){ 1 }, sizeof(int)); if( p_tls != NULL ) { @@ -2567,140 +2567,5 @@ static void httpd_HostThread( httpd_host_t *host ) stats_CounterClean( p_total_counter ); if( p_active_counter ) stats_CounterClean( p_active_counter ); -} - -#else /* ENABLE_HTTPD */ - -/* We just define an empty wrapper */ -httpd_host_t *httpd_TLSHostNew( vlc_object_t *a, char *b, int c, - tls_server_t *d ) -{ - msg_Err( a, "HTTP daemon support is disabled" ); - return NULL; -} - -httpd_host_t *httpd_HostNew( vlc_object_t *a, char *b, int c ) -{ - msg_Err( a, "HTTP daemon support is disabled" ); - return NULL; -} - -void httpd_HostDelete( httpd_host_t *a ) -{ -} - -httpd_url_t *httpd_UrlNew( httpd_host_t *host, char *psz_url, - char *psz_user, char *psz_password, - const vlc_acl_t *p_acl ) -{ - return NULL; -} - -httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, char *psz_url, - char *psz_user, char *psz_password, - const vlc_acl_t *p_acl ) -{ - return NULL; -} - -int httpd_UrlCatch( httpd_url_t *a, int b, httpd_callback_t c, - httpd_callback_sys_t *d ) -{ - return 0; -} - -void httpd_UrlDelete( httpd_url_t *a ) -{ -} - -char* httpd_ClientIP( httpd_client_t *cl, char *psz_ip ) -{ - return NULL; -} - -char* httpd_ServerIP( httpd_client_t *cl, char *psz_ip ) -{ return NULL; } - -void httpd_ClientModeStream( httpd_client_t *a ) -{ -} - -void httpd_ClientModeBidir( httpd_client_t *a ) -{ -} - -void httpd_FileDelete( httpd_file_t *a ) -{ -} - -httpd_file_t *httpd_FileNew( httpd_host_t *a, char *b, char *c, char *d, - char *e, httpd_file_callback_t f, - httpd_file_sys_t *g ) -{ - return NULL; -} - -httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url, - const char *psz_user, - const char *psz_password, - const vlc_acl_t *p_acl, - httpd_handler_callback_t pf_fill, - httpd_handler_sys_t *p_sys ) -{ - return NULL; -} - -void httpd_HandlerDelete( httpd_handler_t *handler ) -{ -} - -void httpd_RedirectDelete( httpd_redirect_t *a ) -{ -} - -httpd_redirect_t *httpd_RedirectNew( httpd_host_t *a, - char *b, char *c ) -{ - return NULL; -} - -void httpd_StreamDelete( httpd_stream_t *a ) -{ -} - -int httpd_StreamHeader( httpd_stream_t *a, uint8_t *b, int c ) -{ - return 0; -} - -int httpd_StreamSend ( httpd_stream_t *a, uint8_t *b, int c ) -{ - return 0; -} - -httpd_stream_t *httpd_StreamNew( httpd_host_t *a, char *b, char *c, - char *d, char *e ) -{ - return NULL; -} - -void httpd_MsgInit ( httpd_message_t *a ) -{ -} - -void httpd_MsgAdd ( httpd_message_t *a, const char *b, const char *c, ... ) -{ -} - -const char *httpd_MsgGet ( httpd_message_t *a, const char *b ) -{ - return ""; -} - -void httpd_MsgClean( httpd_message_t *a ) -{ -} - -#endif /* ENABLE_HTTPD */