X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=be405df1e4a78a748f4d06ada4b3341c74d52cf0;hb=220001b94b02869650ea714461c90def6bd55770;hp=086432093b6d06545b7c7679a9a2c25cd6b0428f;hpb=52b0f7ea4eea7123432ed3cf0db42be3697fef92;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index 086432093b..be405df1e4 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -2,6 +2,7 @@ * httpd.c ***************************************************************************** * Copyright (C) 2004-2006 the VideoLAN team + * Copyright © 2004-2007 Rémi Denis-Courmont * $Id$ * * Authors: Laurent Aimar @@ -22,19 +23,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include - -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#ifdef ENABLE_HTTPD +#include +#include #include -#include #include #include #include +#include #include "../libvlc.h" #include @@ -86,7 +87,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; @@ -94,11 +95,9 @@ struct httpd_host_t int *fds; unsigned nfd; - /* Statistics */ - counter_t *p_active_counter; - counter_t *p_total_counter; - + 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 @@ -164,8 +163,6 @@ struct httpd_client_t int i_ref; - struct sockaddr_storage sock; - int i_sock_size; int fd; int i_mode; @@ -192,66 +189,9 @@ struct httpd_client_t /***************************************************************************** * Various functions *****************************************************************************/ -/*char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";*/ -static void b64_decode( char *restrict dest, const char *restrict src ) -{ - int i_level; - int last = 0; - int b64[256] = { - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 00-0F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 10-1F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, /* 20-2F */ - 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1, /* 30-3F */ - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, /* 40-4F */ - 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, /* 50-5F */ - -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, /* 60-6F */ - 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, /* 70-7F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 80-8F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 90-9F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* A0-AF */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* B0-BF */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* C0-CF */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* D0-DF */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* E0-EF */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 /* F0-FF */ - }; - - for( i_level = 0; *src != '\0'; src++ ) - { - int c; - - c = b64[(unsigned int)*src]; - if( c == -1 ) - { - continue; - } - - switch( i_level ) - { - case 0: - i_level++; - break; - case 1: - *dest++ = ( last << 2 ) | ( ( c >> 4)&0x03 ); - i_level++; - break; - case 2: - *dest++ = ( ( last << 4 )&0xf0 ) | ( ( c >> 2 )&0x0f ); - i_level++; - break; - case 3: - *dest++ = ( ( last &0x03 ) << 6 ) | c; - i_level = 0; - } - last = c; - } - - *dest = '\0'; -} - -static struct +static const struct { - const char *psz_ext; + const char psz_ext[8]; const char *psz_mime; } http_mime[] = { @@ -269,7 +209,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" }, @@ -286,15 +227,19 @@ 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" }, /* end */ - { NULL, NULL } + { "", "" } }; static const char *httpd_MimeFromUrl( const char *psz_url ) @@ -307,7 +252,7 @@ static const char *httpd_MimeFromUrl( const char *psz_url ) { int i; - for( i = 0; http_mime[i].psz_ext != NULL ; i++ ) + for( i = 0; http_mime[i].psz_ext[0] ; i++ ) { if( !strcasecmp( http_mime[i].psz_ext, psz_ext ) ) { @@ -321,81 +266,83 @@ static const char *httpd_MimeFromUrl( const char *psz_url ) typedef struct { - int i_code; - const char *psz_reason; + unsigned i_code; + const char psz_reason[36]; } http_status_info; static const http_status_info http_reason[] = { /*{ 100, "Continue" }, { 101, "Switching Protocols" },*/ - { 200, "OK" }/*, - { 201, "Created" }, + { 200, "OK" }, + /*{ 201, "Created" }, { 202, "Accepted" }, - { 203, "Non-Authoritative Information" }, - { 204, "No Content" }, - { 205, "Reset Content" }, - { 206, "Partial Content" }, - { 250, "Low on Storage Space" }, - { 300, "Multiple Choices" }*/, - { 301, "Moved Permanently" }/*, - { 302, "Moved Temporarily" }, - aka "Found" - { 303, "See Other" }, - { 304, "Not Modified" }, - { 305, "Use Proxy" }, - { 307, "Temporary Redirect" }, - { 400, "Bad Request" }*/, - { 401, "Unauthorized" }/*, - { 402, "Payment Required" }*/, + { 203, "Non-authoritative information" }, + { 204, "No content" }, + { 205, "Reset content" }, + { 206, "Partial content" }, + { 250, "Low on storage space" }, + { 300, "Multiple choices" },*/ + { 301, "Moved permanently" }, + /*{ 302, "Moved temporarily" }, + { 303, "See other" }, + { 304, "Not modified" }, + { 305, "Use proxy" }, + { 307, "Temporary redirect" }, + { 400, "Bad request" },*/ + { 401, "Unauthorized" }, + /*{ 402, "Payment Required" },*/ { 403, "Forbidden" }, - { 404, "Not Found" }/*, - { 405, "Method Not Allowed" }, - { 406, "Not Acceptable" }, - { 407, "Proxy Authentication Required" }, - { 408, "Request Time-out" }, + { 404, "Not found" }, + { 405, "Method not allowed" }, + /*{ 406, "Not acceptable" }, + { 407, "Proxy authentication required" }, + { 408, "Request time-out" }, { 409, "Conflict" }, { 410, "Gone" }, - { 411, "Length Required" }, - { 412, "Precondition Failed" }, - { 413, "Request Entity Too Large" }, - { 414, "Request-URI Too Large" }, - { 415, "Unsupported Media Type" }, + { 411, "Length required" }, + { 412, "Precondition failed" }, + { 413, "Request entity too large" }, + { 414, "Request-URI too large" }, + { 415, "Unsupported media Type" }, { 416, "Requested range not satisfiable" }, - { 417, "Expectation Failed" }, - { 451, "Parameter Not Understood" }, - { 452, "Conference Not Found" }, - { 453, "Not Enough Bandwidth" }*/, - { 454, "Session Not Found" }/*, - { 455, "Method Not Valid in This State" }, - { 456, "Header Field Not Valid for Resource" }, - { 457, "Invalid Range" }, - { 458, "Parameter Is Read-Only" }, + { 417, "Expectation failed" }, + { 451, "Parameter not understood" }, + { 452, "Conference not found" }, + { 453, "Not enough bandwidth" },*/ + { 454, "Session not found" }, + /*{ 455, "Method not valid in this State" },*/ + { 456, "Header field not valid for resource" }, + /*{ 457, "Invalid range" }, + { 458, "Read-only parameter" },*/ { 459, "Aggregate operation not allowed" }, - { 460, "Only aggregate operation allowed" }*/, - { 461, "Unsupported transport" }/*, - { 462, "Destination unreachable" }*/, - { 500, "Internal Server Error" }, - { 501, "Not Implemented" }/*, - { 502, "Bad Gateway" }*/, - { 503, "Service Unavailable" }/*, - { 504, "Gateway Time-out" }, - { 505, "Protocol version not supported" }*/, - { 0, NULL } + { 460, "Non-aggregate operation not allowed" }, + { 461, "Unsupported transport" }, + /*{ 462, "Destination unreachable" },*/ + { 500, "Internal server error" }, + { 501, "Not implemented" }, + /*{ 502, "Bad gateway" },*/ + { 503, "Service unavailable" }, + /*{ 504, "Gateway time-out" },*/ + { 505, "Protocol version not supported" }, + { 551, "Option not supported" }, + { 999, "" } }; -static const char *psz_fallback_reason[] = -{ "Continue", "OK", "Found", "Client Error", "Server Error" }; +static const char psz_fallback_reason[5][16] = +{ "Continue", "OK", "Found", "Client error", "Server error" }; -static const char *httpd_ReasonFromCode( int i_code ) +static const char *httpd_ReasonFromCode( unsigned i_code ) { const http_status_info *p; - for (p = http_reason; p->i_code < i_code; p++); + assert( ( i_code >= 100 ) && ( i_code <= 599 ) ); + + for (p = http_reason; i_code > p->i_code; p++); if( p->i_code == i_code ) return p->psz_reason; - assert( ( i_code >= 100 ) && ( i_code <= 599 ) ); return psz_fallback_reason[(i_code / 100) - 1]; } @@ -446,10 +393,11 @@ struct httpd_file_t }; -static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query ) +static int +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; @@ -459,11 +407,10 @@ static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, return VLC_SUCCESS; } answer->i_proto = HTTPD_PROTO_HTTP; - answer->i_version= query->i_version; + answer->i_version= 1; answer->i_type = HTTPD_MSG_ANSWER; answer->i_status = 200; - answer->psz_status = strdup( "OK" ); httpd_MsgAdd( answer, "Content-type", "%s", file->psz_mime ); httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); @@ -487,6 +434,7 @@ static int 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 ) @@ -498,7 +446,7 @@ static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, psz_connection = httpd_MsgGet( &cl->query, "Connection" ); if( psz_connection != NULL ) { - httpd_MsgAdd( answer, "Connection", psz_connection ); + httpd_MsgAdd( answer, "Connection", "%s", psz_connection ); } httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); @@ -545,14 +493,18 @@ httpd_file_t *httpd_FileNew( httpd_host_t *host, return file; } -void httpd_FileDelete( httpd_file_t *file ) +httpd_file_sys_t *httpd_FileDelete( httpd_file_t *file ) { + httpd_file_sys_t *p_sys = file->p_sys; + httpd_UrlDelete( file->url ); free( file->psz_url ); free( file->psz_mime ); free( file ); + + return p_sys; } /***************************************************************************** @@ -567,10 +519,11 @@ struct httpd_handler_t }; -static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query ) +static int +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 ) @@ -582,11 +535,11 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c /* We do it ourselves, thanks */ answer->i_status = 0; - answer->psz_status = 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, @@ -595,6 +548,8 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c if( query->i_type == HTTPD_MSG_HEAD ) { char *p = (char *)answer->p_body; + + /* Looks for end of header (i.e. one empty line) */ while ( (p = strchr( p, '\r' )) != NULL ) { if( p[1] && p[1] == '\n' && p[2] && p[2] == '\r' @@ -603,6 +558,7 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c break; } } + if( p != NULL ) { p[4] = '\0'; @@ -631,20 +587,8 @@ static int httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *c psz_headers = (char *)answer->p_body; i_headers = answer->i_body; } - switch( i_status ) - { - case 200: - psz_status = "OK"; - break; - case 401: - psz_status = "Unauthorized"; - break; - default: - if( (i_status < 0) || (i_status > 999) ) - i_status = 500; - psz_status = "Undefined"; - break; - } + + 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); @@ -687,10 +631,12 @@ httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url, return handler; } -void httpd_HandlerDelete( httpd_handler_t *handler ) +httpd_handler_sys_t *httpd_HandlerDelete( httpd_handler_t *handler ) { + httpd_handler_sys_t *p_sys = handler->p_sys; httpd_UrlDelete( handler->url ); free( handler ); + return p_sys; } /***************************************************************************** @@ -704,20 +650,20 @@ struct httpd_redirect_t static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, - httpd_message_t *query ) + const httpd_message_t *query ) { httpd_redirect_t *rdir = (httpd_redirect_t*)p_sys; char *p_body; + (void)cl; if( answer == NULL || query == NULL ) { return VLC_SUCCESS; } - answer->i_proto = query->i_proto; - answer->i_version= query->i_version; + answer->i_proto = HTTPD_PROTO_HTTP; + answer->i_version= 1; answer->i_type = HTTPD_MSG_ANSWER; answer->i_status = 301; - answer->psz_status = strdup( "Moved Permanently" ); answer->i_body = httpd_HtmlError (&p_body, 301, rdir->psz_dst); answer->p_body = (unsigned char *)p_body; @@ -784,7 +730,7 @@ struct httpd_stream_t static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, - httpd_message_t *query ) + const httpd_message_t *query ) { httpd_stream_t *stream = (httpd_stream_t*)p_sys; @@ -853,7 +799,6 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, answer->i_type = HTTPD_MSG_ANSWER; answer->i_status = 200; - answer->psz_status = strdup( "OK" ); if( query->i_type != HTTPD_MSG_HEAD ) { @@ -877,7 +822,7 @@ 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", @@ -893,7 +838,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; } } @@ -925,7 +870,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 ); @@ -956,11 +901,9 @@ 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 ) { @@ -1012,16 +955,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, @@ -1042,7 +985,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 lockval, ptrval; int i; if( psz_hostname == NULL ) @@ -1050,23 +993,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_global, "httpd_mutex", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc_global, "httpd_mutex", &lockval ); + 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 ); + 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 ); free( psz_host ); @@ -1076,7 +1017,9 @@ 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_hold( httpd ); vlc_object_attach( httpd, p_this->p_libvlc ); } @@ -1091,8 +1034,13 @@ 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 ); return host; @@ -1127,13 +1075,14 @@ 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; host->httpd = httpd; - vlc_mutex_init( httpd, &host->lock ); + vlc_mutex_init( &host->lock ); + vlc_cond_init( &host->wait ); host->i_ref = 1; host->fds = net_ListenTCP( p_this, psz_host, i_port ); @@ -1144,6 +1093,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; @@ -1155,8 +1110,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; @@ -1172,17 +1127,19 @@ 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_object_release( httpd ); } vlc_mutex_unlock( lockval.p_address ); 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 ) @@ -1198,10 +1155,14 @@ void httpd_HostDelete( httpd_host_t *host ) vlc_value_t lockval; int i; - var_Get( httpd->p_libvlc_global, "httpd_mutex", &lockval ); + var_Get( httpd->p_libvlc, "httpd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( &host->lock ); host->i_ref--; + if( host->i_ref == 0 ) + vlc_cond_signal( &host->wait ); + vlc_mutex_unlock( &host->lock ); if( host->i_ref > 0 ) { /* still used */ @@ -1211,8 +1172,8 @@ void httpd_HostDelete( httpd_host_t *host ) } TAB_REMOVE( httpd->i_host, httpd->host, host ); - host->b_die = 1; - vlc_thread_join( host ); + vlc_object_kill( host ); + vlc_join( host->thread, NULL ); msg_Dbg( host, "HTTP host removed" ); @@ -1237,15 +1198,19 @@ 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" ); + + libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; vlc_object_detach( httpd ); - vlc_object_destroy( httpd ); + vlc_object_release( httpd ); + } vlc_mutex_unlock( lockval.p_address ); } @@ -1253,11 +1218,13 @@ void httpd_HostDelete( httpd_host_t *host ) /* 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; + assert( psz_url != NULL ); + vlc_mutex_lock( &host->lock ); if( b_check ) { @@ -1276,7 +1243,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url url = malloc( 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 : "" ); @@ -1288,6 +1255,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; @@ -1298,7 +1266,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, @@ -1306,7 +1274,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 */ @@ -1354,15 +1322,14 @@ 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; msg->i_proto = HTTPD_PROTO_NONE; - msg->i_version = -1; + msg->i_version = -1; /* FIXME */ msg->i_status = 0; - msg->psz_status = NULL; msg->psz_url = NULL; msg->psz_args = NULL; @@ -1376,46 +1343,27 @@ void httpd_MsgInit( httpd_message_t *msg ) msg->i_body_offset = 0; msg->i_body = 0; - msg->p_body = 0; + msg->p_body = NULL; } -void httpd_MsgClean( httpd_message_t *msg ) +static void httpd_MsgClean( httpd_message_t *msg ) { int i; - if( msg->psz_status ) - { - free( msg->psz_status ); - } - 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 ); } -const char *httpd_MsgGet( httpd_message_t *msg, const char *name ) +const char *httpd_MsgGet( const httpd_message_t *msg, const char *name ) { int i; @@ -1435,19 +1383,19 @@ void httpd_MsgAdd( httpd_message_t *msg, const char *name, const char *psz_value char *value = NULL; va_start( args, psz_value ); -#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined(SYS_BEOS) - vasprintf( &value, psz_value, args ); -#else - { - int i_size = strlen( psz_value ) + 4096; /* FIXME stupid system */ - value = calloc( i_size, sizeof( char ) ); - vsnprintf( value, i_size, psz_value, args ); - value[i_size - 1] = 0; - } -#endif + if( vasprintf( &value, psz_value, args ) == -1 ) + value = NULL; va_end( args ); + if( value == NULL ) + return; + name = strdup( name ); + if( name == NULL ) + { + free( value ); + return; + } TAB_APPEND( msg->i_name, msg->name, (char*)name ); TAB_APPEND( msg->i_value, msg->value, value ); @@ -1457,12 +1405,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->i_mode = HTTPD_CLIENT_FILE; - cl->b_read_waiting = VLC_FALSE; + cl->b_read_waiting = false; httpd_MsgInit( &cl->query ); httpd_MsgInit( &cl->answer ); @@ -1501,16 +1449,11 @@ 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, struct sockaddr_storage *sock, - int i_sock_size, - tls_session_t *p_tls, mtime_t now ) +static httpd_client_t *httpd_ClientNew( int fd, tls_session_t *p_tls, mtime_t now ) { httpd_client_t *cl = malloc( sizeof( httpd_client_t ) ); @@ -1518,8 +1461,6 @@ static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock, cl->i_ref = 0; cl->fd = fd; - memcpy( &cl->sock, sock, sizeof( cl->sock ) ); - cl->i_sock_size = i_sock_size; cl->url = NULL; cl->p_tls = p_tls; @@ -1528,77 +1469,116 @@ static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock, 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 ); + 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; +} + - return send( cl->fd, p, i_len, 0 ); +static const struct +{ + const char name[16]; + int i_type; + int i_proto; } +msg_type[] = +{ + { "OPTIONS", HTTPD_MSG_OPTIONS, HTTPD_PROTO_RTSP }, + { "DESCRIBE", HTTPD_MSG_DESCRIBE, HTTPD_PROTO_RTSP }, + { "SETUP", HTTPD_MSG_SETUP, HTTPD_PROTO_RTSP }, + { "PLAY", HTTPD_MSG_PLAY, HTTPD_PROTO_RTSP }, + { "PAUSE", HTTPD_MSG_PAUSE, HTTPD_PROTO_RTSP }, + { "GET_PARAMETER", HTTPD_MSG_GETPARAMETER, HTTPD_PROTO_RTSP }, + { "TEARDOWN", HTTPD_MSG_TEARDOWN, HTTPD_PROTO_RTSP }, + { "GET", HTTPD_MSG_GET, HTTPD_PROTO_HTTP }, + { "HEAD", HTTPD_MSG_HEAD, HTTPD_PROTO_HTTP }, + { "POST", HTTPD_MSG_POST, HTTPD_PROTO_HTTP }, + { "", HTTPD_MSG_NONE, HTTPD_PROTO_NONE } +}; + static void httpd_ClientRecv( httpd_client_t *cl ) { int i_len; + /* ignore leading whites */ + if( ( cl->query.i_proto == HTTPD_PROTO_NONE ) && + ( cl->i_buffer == 0 ) ) + { + unsigned char c; + + i_len = httpd_NetRecv( cl, &c, 1 ); + + if( ( i_len > 0 ) && ( strchr( "\r\n\t ", c ) == NULL ) ) + { + cl->p_buffer[0] = c; + cl->i_buffer++; + } + } + else if( cl->query.i_proto == HTTPD_PROTO_NONE ) { - /* enough to see if it's rtp over rtsp or RTSP/HTTP */ + /* enough to see if it's Interleaved RTP over RTSP or RTSP/HTTP */ i_len = httpd_NetRecv( cl, &cl->p_buffer[cl->i_buffer], - 4 - cl->i_buffer ); + 7 - cl->i_buffer ); if( i_len > 0 ) { cl->i_buffer += i_len; } - if( cl->i_buffer >= 4 ) + if( ( cl->i_buffer >= 4 ) && ( cl->p_buffer[0] == '$' ) ) { - /*fprintf( stderr, "peek=%4.4s\n", cl->p_buffer );*/ - /* detect type */ - if( cl->p_buffer[0] == '$' ) - { - /* RTSP (rtp over rtsp) */ - cl->query.i_proto = HTTPD_PROTO_RTSP; - 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->i_buffer = 0; - } - else if( !memcmp( cl->p_buffer, "HTTP", 4 ) ) + /* Interleaved RTP over RTSP */ + cl->query.i_proto = HTTPD_PROTO_RTSP; + 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->i_buffer -= 4; + memcpy( cl->query.p_body, cl->p_buffer + 4, cl->i_buffer ); + } + else + /* The smallest legal request is 7 bytes ("GET /\r\n"), + * this is the maximum we can ask at this point. */ + if( cl->i_buffer >= 7 ) + { + if( !memcmp( cl->p_buffer, "HTTP/1.", 7 ) ) { cl->query.i_proto = HTTPD_PROTO_HTTP; cl->query.i_type = HTTPD_MSG_ANSWER; } - else if( !memcmp( cl->p_buffer, "RTSP", 4 ) ) + else if( !memcmp( cl->p_buffer, "RTSP/1.", 7 ) ) { cl->query.i_proto = HTTPD_PROTO_RTSP; cl->query.i_type = HTTPD_MSG_ANSWER; } - else if( !memcmp( cl->p_buffer, "GET ", 4 ) || - !memcmp( cl->p_buffer, "HEAD", 4 ) || - !memcmp( cl->p_buffer, "POST", 4 ) ) - { - cl->query.i_proto = HTTPD_PROTO_HTTP; - cl->query.i_type = HTTPD_MSG_NONE; - } else { - cl->query.i_proto = HTTPD_PROTO_RTSP; + /* We need the full request line to determine the protocol. */ + cl->query.i_proto = HTTPD_PROTO_HTTP0; cl->query.i_type = HTTPD_MSG_NONE; } } @@ -1622,6 +1602,19 @@ static void httpd_ClientRecv( httpd_client_t *cl ) /* we are reading a header -> char by char */ for( ;; ) { + if( cl->i_buffer == cl->i_buffer_size ) + { + uint8_t *newbuf = realloc( cl->p_buffer, cl->i_buffer_size + 1024 ); + if( newbuf == NULL ) + { + i_len = 0; + break; + } + + cl->p_buffer = newbuf; + cl->i_buffer_size += 1024; + } + i_len = httpd_NetRecv (cl, &cl->p_buffer[cl->i_buffer], 1 ); if( i_len <= 0 ) { @@ -1629,11 +1622,74 @@ static void httpd_ClientRecv( httpd_client_t *cl ) } cl->i_buffer++; - if( cl->i_buffer + 1 >= cl->i_buffer_size ) + if( ( cl->query.i_proto == HTTPD_PROTO_HTTP0 ) + && ( cl->p_buffer[cl->i_buffer - 1] == '\n' ) ) { - cl->i_buffer_size += 1024; - cl->p_buffer = realloc( cl->p_buffer, cl->i_buffer_size ); + /* Request line is now complete */ + const char *p = memchr( cl->p_buffer, ' ', cl->i_buffer ); + size_t len; + + assert( cl->query.i_type == HTTPD_MSG_NONE ); + + if( p == NULL ) /* no URI: evil guy */ + { + i_len = 0; /* drop connection */ + break; + } + + do + p++; /* skips extra spaces */ + while( *p == ' ' ); + + p = memchr( p, ' ', ((char *)cl->p_buffer) + cl->i_buffer - p ); + if( p == NULL ) /* no explicit protocol: HTTP/0.9 */ + { + i_len = 0; /* not supported currently -> drop */ + break; + } + + do + p++; /* skips extra spaces ever again */ + while( *p == ' ' ); + + len = ((char *)cl->p_buffer) + cl->i_buffer - p; + if( len < 7 ) /* foreign protocol */ + i_len = 0; /* I don't understand -> drop */ + else + if( memcmp( p, "HTTP/1.", 7 ) == 0 ) + { + cl->query.i_proto = HTTPD_PROTO_HTTP; + cl->query.i_version = atoi( p + 7 ); + } + else + if( memcmp( p, "RTSP/1.", 7 ) == 0 ) + { + cl->query.i_proto = HTTPD_PROTO_RTSP; + cl->query.i_version = atoi( p + 7 ); + } + else + if( memcmp( p, "HTTP/", 5 ) == 0 ) + { + const uint8_t sorry[] = + "HTTP/1.1 505 Unknown HTTP version\r\n\r\n"; + httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 ); + i_len = 0; /* drop */ + } + else + if( memcmp( p, "RTSP/", 5 ) == 0 ) + { + const uint8_t sorry[] = + "RTSP/1.0 505 Unknown RTSP version\r\n\r\n"; + httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 ); + i_len = 0; /* drop */ + } + else /* yet another foreign protocol */ + i_len = 0; + + if( i_len == 0 ) + break; } + if( ( cl->i_buffer >= 2 && !memcmp( &cl->p_buffer[cl->i_buffer-2], "\n\n", 2 ) )|| ( cl->i_buffer >= 4 && !memcmp( &cl->p_buffer[cl->i_buffer-4], "\r\n\r\n", 4 ) ) ) { @@ -1651,48 +1707,23 @@ static void httpd_ClientRecv( httpd_client_t *cl ) strtol( (char *)&cl->p_buffer[8], &p, 0 ); while( *p == ' ' ) - { p++; - } - cl->query.psz_status = strdup( p ); } else { - static const struct - { - const char *name; - int i_type; - int i_proto; - } - msg_type[] = - { - { "OPTIONS", HTTPD_MSG_OPTIONS, HTTPD_PROTO_RTSP }, - { "DESCRIBE", HTTPD_MSG_DESCRIBE, HTTPD_PROTO_RTSP }, - { "SETUP", HTTPD_MSG_SETUP, HTTPD_PROTO_RTSP }, - { "PLAY", HTTPD_MSG_PLAY, HTTPD_PROTO_RTSP }, - { "PAUSE", HTTPD_MSG_PAUSE, HTTPD_PROTO_RTSP }, - { "GET_PARAMETER", HTTPD_MSG_GETPARAMETER, HTTPD_PROTO_RTSP }, - { "TEARDOWN", HTTPD_MSG_TEARDOWN, HTTPD_PROTO_RTSP }, - - { "GET", HTTPD_MSG_GET, HTTPD_PROTO_HTTP }, - { "HEAD", HTTPD_MSG_HEAD, HTTPD_PROTO_HTTP }, - { "POST", HTTPD_MSG_POST, HTTPD_PROTO_HTTP }, - - { NULL, HTTPD_MSG_NONE, HTTPD_PROTO_NONE } - }; - int i; + unsigned i; p = NULL; cl->query.i_type = HTTPD_MSG_NONE; /*fprintf( stderr, "received new request=%s\n", cl->p_buffer);*/ - for( i = 0; msg_type[i].name != NULL; i++ ) + for( i = 0; msg_type[i].name[0]; i++ ) { if( !strncmp( (char *)cl->p_buffer, msg_type[i].name, strlen( msg_type[i].name ) ) ) { - p = (char *)&cl->p_buffer[strlen((char *)msg_type[i].name) + 1 ]; + p = (char *)&cl->p_buffer[strlen(msg_type[i].name) + 1 ]; cl->query.i_type = msg_type[i].i_type; if( cl->query.i_proto != msg_type[i].i_proto ) { @@ -1728,12 +1759,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, '?' ) ) ) @@ -1741,23 +1776,6 @@ static void httpd_ClientRecv( httpd_client_t *cl ) *p3++ = '\0'; cl->query.psz_args = (uint8_t *)strdup( p3 ); } - if( p2 ) - { - while( *p2 == ' ' ) - { - p2++; - } - if( !strncasecmp( p2, "HTTP/1.", 7 ) ) - { - cl->query.i_proto = HTTPD_PROTO_HTTP; - cl->query.i_version = atoi( p2+7 ); - } - else if( !strncasecmp( p2, "RTSP/1.", 7 ) ) - { - cl->query.i_proto = HTTPD_PROTO_RTSP; - cl->query.i_version = atoi( p2+7 ); - } - } p = p2; } } @@ -1816,7 +1834,8 @@ static void httpd_ClientRecv( httpd_client_t *cl ) } if( cl->query.i_body > 0 ) { - /* TODO Mhh, handle the case client will only send a request and close the connection + /* 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->i_buffer = 0; @@ -1833,7 +1852,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 ) @@ -1893,9 +1912,9 @@ static void httpd_ClientSend( httpd_client_t *cl ) /* We need to create the header */ int i_size = 0; char *p; + const char *psz_status = httpd_ReasonFromCode( cl->answer.i_status ); - i_size = strlen( "HTTP/1.") + 10 + 10 + - strlen( cl->answer.psz_status ? cl->answer.psz_status : "" ) + 5; + i_size = strlen( "HTTP/1.") + 10 + 10 + strlen( psz_status ) + 5; for( i = 0; i < cl->answer.i_name; i++ ) { i_size += strlen( cl->answer.name[i] ) + 2 + @@ -1910,10 +1929,10 @@ static void httpd_ClientSend( httpd_client_t *cl ) } p = (char *)cl->p_buffer; - p += sprintf( p, "%s/1.%d %d %s\r\n", - cl->answer.i_proto == HTTPD_PROTO_HTTP ? "HTTP" : "RTSP", + p += sprintf( p, "%s.%u %d %s\r\n", + cl->answer.i_proto == HTTPD_PROTO_HTTP ? "HTTP/1" : "RTSP/1", cl->answer.i_version, - cl->answer.i_status, cl->answer.psz_status ); + cl->answer.i_status, psz_status ); for( i = 0; i < cl->answer.i_name; i++ ) { p += sprintf( p, "%s: %s\r\n", cl->answer.name[i], @@ -1973,7 +1992,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 */ @@ -2019,31 +2038,23 @@ 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_object_waitpipe( VLC_OBJECT( host ) ); - host->p_total_counter = stats_CounterCreate( host, - VLC_VAR_INTEGER, STATS_COUNTER ); - host->p_active_counter = stats_CounterCreate( host, - VLC_VAR_INTEGER, STATS_COUNTER ); - - while( !host->b_die ) + for( ;; ) { - if( host->i_url <= 0 ) - { - /* 0.2s */ - msleep( 200000 ); - continue; - } - /* prepare a new TLS session */ if( ( p_tls == NULL ) && ( host->p_tls != NULL ) ) p_tls = tls_ServerSessionPrepare( host->p_tls ); - struct pollfd ufd[host->nfd + host->i_client]; + struct pollfd ufd[host->nfd + host->i_client + 1]; unsigned nfd; - for (nfd = 0; nfd < host->nfd; nfd++) + for( nfd = 0; nfd < host->nfd; nfd++ ) { ufd[nfd].fd = host->fds[nfd]; ufd[nfd].events = POLLIN; @@ -2052,8 +2063,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++ ) { @@ -2064,7 +2078,7 @@ static void httpd_HostThread( httpd_host_t *host ) cl->i_activity_date+cl->i_activity_timeout < now) ) ) ) { httpd_ClientClean( cl ); - stats_UpdateInteger( host, host->p_active_counter, -1, NULL ); + stats_UpdateInteger( host, p_active_counter, -1, NULL ); TAB_REMOVE( host->i_client, host->client, cl ); free( cl ); i_client--; @@ -2128,30 +2142,48 @@ static void httpd_HostThread( httpd_host_t *host ) } else if( i_msg == HTTPD_MSG_OPTIONS ) { - const char *psz_cseq; - int i_cseq; - /* unimplemented */ - answer->i_proto = query->i_proto ; answer->i_type = HTTPD_MSG_ANSWER; - answer->i_version= 0; + answer->i_proto = query->i_proto; answer->i_status = 200; - answer->psz_status = strdup( "Ok" ); - answer->i_body = 0; answer->p_body = NULL; - psz_cseq = httpd_MsgGet( query, "Cseq" ); - if( psz_cseq ) - i_cseq = atoi( psz_cseq ); - else - i_cseq = 0; - httpd_MsgAdd( answer, "Cseq", "%d", i_cseq ); - httpd_MsgAdd( answer, "Server", "VLC Server" ); - httpd_MsgAdd( answer, "Public", "DESCRIBE, SETUP, " - "TEARDOWN, PLAY, PAUSE" ); - httpd_MsgAdd( answer, "Content-Length", "%d", - answer->i_body ); + httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING ); + httpd_MsgAdd( answer, "Content-Length", "0" ); + + switch( query->i_proto ) + { + case HTTPD_PROTO_HTTP: + answer->i_version = 1; + httpd_MsgAdd( answer, "Allow", + "GET,HEAD,POST,OPTIONS" ); + break; + + case HTTPD_PROTO_RTSP: + { + const char *p; + answer->i_version = 0; + + p = httpd_MsgGet( query, "Cseq" ); + if( p != NULL ) + httpd_MsgAdd( answer, "Cseq", "%s", p ); + p = httpd_MsgGet( query, "Timestamp" ); + if( p != NULL ) + httpd_MsgAdd( answer, "Timestamp", "%s", p ); + + p = httpd_MsgGet( query, "Require" ); + if( p != NULL ) + { + answer->i_status = 551; + httpd_MsgAdd( query, "Unsupported", "%s", p ); + } + + httpd_MsgAdd( answer, "Public", "DESCRIBE,SETUP," + "TEARDOWN,PLAY,PAUSE,GET_PARAMETER" ); + break; + } + } cl->i_buffer = -1; /* Force the creation of the answer in * httpd_ClientSend */ @@ -2173,7 +2205,6 @@ static void httpd_HostThread( httpd_host_t *host ) answer->i_type = HTTPD_MSG_ANSWER; answer->i_version= 0; answer->i_status = 501; - answer->psz_status = strdup( "Unimplemented" ); answer->i_body = httpd_HtmlError (&p, 501, NULL); answer->p_body = (uint8_t *)p; @@ -2185,8 +2216,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++ ) @@ -2201,54 +2232,51 @@ static void httpd_HostThread( httpd_host_t *host ) { char ip[NI_MAXNUMERICHOST]; - if( httpd_ClientIP( cl, ip ) != NULL ) + if( ( httpd_ClientIP( cl, ip ) == NULL ) + || ACL_Check( url->p_acl, ip ) ) { - if( ACL_Check( url->p_acl, ip ) ) - { - b_hosts_failed = VLC_TRUE; - break; - } + b_hosts_failed = true; + break; } - else - b_hosts_failed = VLC_TRUE; } if( answer && ( *url->psz_user || *url->psz_password ) ) { /* create the headers */ const char *b64 = httpd_MsgGet( query, "Authorization" ); /* BASIC id */ - char *auth; - char *id; + char *user = NULL, *pass = NULL; - asprintf( &id, "%s:%s", url->psz_user, url->psz_password ); if( b64 != NULL - && !strncasecmp( b64, "BASIC", 5 ) ) + && !strncasecmp( b64, "BASIC", 5 ) ) { b64 += 5; while( *b64 == ' ' ) - { b64++; + + user = vlc_b64_decode( b64 ); + if (user != NULL) + { + pass = strchr (user, ':'); + if (pass != NULL) + *pass++ = '\0'; } - auth = malloc( strlen(b64) + 1 ); - b64_decode( auth, b64 ); - } - else - { - auth = strdup( "" ); } - if( strcmp( id, auth ) ) + if ((user == NULL) || (pass == NULL) + || strcmp (user, url->psz_user) + || strcmp (pass, url->psz_password)) { - httpd_MsgAdd( answer, "WWW-Authenticate", "Basic realm=\"%s\"", url->psz_user ); + httpd_MsgAdd( answer, + "WWW-Authenticate", + "Basic realm=\"%s\"", + url->psz_user ); /* We fail for all url */ - b_auth_failed = VLC_TRUE; - free( id ); - free( auth ); + b_auth_failed = true; + free( user ); break; } - free( id ); - free( auth ); + free( user ); } if( !url->catch[i_msg].cb( url->catch[i_msg].p_sys, cl, answer, query ) ) @@ -2283,18 +2311,15 @@ static void httpd_HostThread( httpd_host_t *host ) if( b_hosts_failed ) { answer->i_status = 403; - answer->psz_status = strdup( "Forbidden" ); } else if( b_auth_failed ) { answer->i_status = 401; - answer->psz_status = strdup( "Authorization Required" ); } else { /* no url registered */ answer->i_status = 404; - answer->psz_status = strdup( "Not found" ); } answer->i_body = httpd_HtmlError (&p, @@ -2316,9 +2341,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 ) @@ -2333,8 +2358,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 ) ) { @@ -2364,7 +2389,7 @@ static void httpd_HostThread( httpd_host_t *host ) free( cl->p_buffer ); cl->p_buffer = malloc( cl->i_buffer_size ); cl->i_state = HTTPD_CLIENT_RECEIVING; - cl->b_read_waiting = VLC_FALSE; + cl->b_read_waiting = false; } else { @@ -2400,11 +2425,6 @@ static void httpd_HostThread( httpd_host_t *host ) cl->answer.i_body = 0; cl->i_state = HTTPD_CLIENT_SENDING; } - else - { - /* we shouldn't wait too long */ - b_low_delay = VLC_TRUE; - } } /* Special for BIDIR mode we also check reading */ @@ -2416,98 +2436,48 @@ static void httpd_HostThread( httpd_host_t *host ) if (pufd->events != 0) nfd++; + else + b_low_delay = true; } vlc_mutex_unlock( &host->lock ); - /* we will wait 100ms or 20ms (not too big 'cause HTTPD_CLIENT_WAITING) */ - switch (poll (ufd, nfd, b_low_delay ? 20 : 100)) + ufd[nfd].fd = evfd; + ufd[nfd].events = POLLIN; + ufd[nfd].revents = 0; + nfd++; + + /* we will wait 20ms (not too big) if HTTPD_CLIENT_WAITING */ + switch( poll( ufd, nfd, b_low_delay ? 20 : -1) ) { case -1: if (errno != EINTR) { - /* This is most likely a bug */ - msg_Err( host, "polling error: %s", strerror (errno)); - msleep( 1000 ); + /* Kernel on low memory or a bug: pace */ + msg_Err( host, "polling error: %m" ); + msleep( 100000 ); } case 0: continue; } - now = mdate(); - - /* accept new connections */ - for (nfd = 0; nfd < host->nfd; nfd++) - { - assert (ufd[nfd].fd == host->fds[nfd]); - - if (ufd[nfd].revents == 0) - continue; - - struct sockaddr_storage addr; - socklen_t addrlen = sizeof (addr); - - int fd = accept (ufd[nfd].fd, (struct sockaddr *)&addr, &addrlen); - if (fd == -1) - continue; - - net_SetupSocket (fd); - - int i_state = 0; - - if (p_tls != NULL) - { - switch (tls_ServerSessionHandshake (p_tls, fd)) - { - case -1: - msg_Err( host, "Rejecting TLS connection" ); - net_Close (fd); - fd = -1; - p_tls = NULL; - break; - - case 1: /* missing input - most likely */ - i_state = HTTPD_CLIENT_TLS_HS_IN; - break; - - case 2: /* missing output */ - i_state = HTTPD_CLIENT_TLS_HS_OUT; - break; - } - - if (p_tls == NULL) - break; // wasted TLS session, cannot accept() anymore - } - - httpd_client_t *cl; - char ip[NI_MAXNUMERICHOST]; - stats_UpdateInteger( host, host->p_total_counter, 1, NULL ); - stats_UpdateInteger( host, host->p_active_counter, 1, NULL ); - cl = httpd_ClientNew( fd, &addr, addrlen, p_tls, now ); - httpd_ClientIP( cl, ip ); - msg_Dbg( host, "Connection from %s", ip ); - p_tls = NULL; - vlc_mutex_lock( &host->lock ); - TAB_APPEND( host->i_client, host->client, cl ); - vlc_mutex_unlock( &host->lock ); - cl->i_state = i_state; // override state for TLS - break; // cannot accept more than one because of TLS - } + if( ufd[nfd - 1].revents ) + break; - /* now try all others socket */ + /* 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 + nfd; + const struct pollfd *pufd = &ufd[nfd]; - assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0]))); + assert( pufd < &ufd[sizeof(ufd) / sizeof(ufd[0])] ); - if (cl->fd != pufd->fd) + if( cl->fd != pufd->fd ) continue; // we were not waiting for this client - nfd++; - - if (pufd->revents == 0) + ++nfd; + if( pufd->revents == 0 ) continue; // no event received cl->i_activity_date = now; @@ -2533,148 +2503,74 @@ 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 ); - } - - if( p_tls != NULL ) - tls_ServerSessionClose( p_tls ); -} - -#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; -} + /* Handle server sockets (accept new connections) */ + for( nfd = 0; nfd < host->nfd; nfd++ ) + { + httpd_client_t *cl; + int i_state = -1; + int fd = ufd[nfd].fd; -void httpd_ClientModeStream( httpd_client_t *a ) -{ -} + assert (fd == host->fds[nfd]); -void httpd_ClientModeBidir( httpd_client_t *a ) -{ -} - -void httpd_FileDelete( httpd_file_t *a ) -{ -} + if( ufd[nfd].revents == 0 ) + continue; -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; -} + /* */ + fd = accept (fd, NULL, NULL); + if (fd == -1) + continue; -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; -} + net_SetupSocket (fd); + if( p_tls != NULL ) + { + switch( tls_ServerSessionHandshake( p_tls, fd ) ) + { + case -1: + msg_Err( host, "Rejecting TLS connection" ); + net_Close( fd ); + fd = -1; + p_tls = NULL; + break; -void httpd_HandlerDelete( httpd_handler_t *handler ) -{ -} + case 1: /* missing input - most likely */ + i_state = HTTPD_CLIENT_TLS_HS_IN; + break; -void httpd_RedirectDelete( httpd_redirect_t *a ) -{ -} + case 2: /* missing output */ + i_state = HTTPD_CLIENT_TLS_HS_OUT; + break; + } -httpd_redirect_t *httpd_RedirectNew( httpd_host_t *a, - char *b, char *c ) -{ - return NULL; -} + if( (p_tls == NULL) != (host->p_tls == NULL) ) + break; // wasted TLS session, cannot accept() anymore + } -void httpd_StreamDelete( httpd_stream_t *a ) -{ -} + stats_UpdateInteger( host, p_total_counter, 1, NULL ); + stats_UpdateInteger( host, p_active_counter, 1, NULL ); + cl = httpd_ClientNew( fd, p_tls, now ); + p_tls = NULL; + vlc_mutex_lock( &host->lock ); + TAB_APPEND( host->i_client, host->client, cl ); + vlc_mutex_unlock( &host->lock ); + if( i_state != -1 ) + cl->i_state = i_state; // override state for TLS -int httpd_StreamHeader( httpd_stream_t *a, uint8_t *b, int c ) -{ - return 0; -} + if (host->p_tls != NULL) + break; // cannot accept further without new TLS session + } -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 ) -{ + if( p_tls != NULL ) + tls_ServerSessionClose( p_tls ); + if( p_total_counter ) + stats_CounterClean( p_total_counter ); + if( p_active_counter ) + stats_CounterClean( p_active_counter ); 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 */