X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=444a72755afefe26b4f1504a69b103b035d8cc8f;hb=4d700eb73b7890bb36c1deb7d903c3d03f79dda2;hp=a4929a7443c841067dbfed97a5401e31fd9ad098;hpb=653329ea28d847b195ccd6aad245e7884e27208a;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index a4929a7443..444a72755a 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -23,13 +23,15 @@ * 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 @@ -185,7 +187,7 @@ struct httpd_client_t /***************************************************************************** * Various functions *****************************************************************************/ -static struct +static const struct { const char psz_ext[8]; const char *psz_mime; @@ -205,7 +207,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 +225,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" }, @@ -302,9 +309,9 @@ static const http_status_info http_reason[] = { 452, "Conference not found" }, { 453, "Not enough bandwidth" },*/ { 454, "Session not found" }, - /*{ 455, "Method not valid in this State" }, + /*{ 455, "Method not valid in this State" },*/ { 456, "Header field not valid for resource" }, - { 457, "Invalid range" }, + /*{ 457, "Invalid range" }, { 458, "Read-only parameter" },*/ { 459, "Aggregate operation not allowed" }, { 460, "Non-aggregate operation not allowed" }, @@ -314,8 +321,8 @@ static const http_status_info http_reason[] = { 501, "Not implemented" }, /*{ 502, "Bad gateway" },*/ { 503, "Service unavailable" }, - /*{ 504, "Gateway time-out" }, - { 505, "Protocol version not supported" },*/ + /*{ 504, "Gateway time-out" },*/ + { 505, "Protocol version not supported" }, { 551, "Option not supported" }, { 999, "" } }; @@ -389,7 +396,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; @@ -399,7 +405,7 @@ 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; @@ -426,6 +432,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 ) @@ -437,7 +444,7 @@ 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 ); @@ -484,14 +491,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; } /***************************************************************************** @@ -511,7 +522,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 ) @@ -527,6 +537,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, @@ -535,6 +546,8 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, 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' @@ -543,6 +556,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, break; } } + if( p != NULL ) { p[4] = '\0'; @@ -615,10 +629,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; } /***************************************************************************** @@ -642,8 +658,8 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys, { 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; @@ -804,7 +820,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", @@ -820,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 +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 ); @@ -883,11 +899,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 ) { @@ -939,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( vlc_object_t * ); /* create a new host */ httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host, @@ -969,7 +983,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 ) @@ -977,23 +991,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 ); + 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 ); @@ -1003,7 +1015,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 ); } @@ -1054,13 +1068,22 @@ 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 ); host->i_ref = 1; host->fds = net_ListenTCP( p_this, psz_host, i_port ); @@ -1083,7 +1106,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, /* create the thread */ if( vlc_thread_create( host, "httpd host thread", httpd_HostThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_LOW, false ) ) { msg_Err( p_this, "cannot spawn http host thread" ); goto error; @@ -1099,9 +1122,10 @@ 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 ); @@ -1109,7 +1133,7 @@ error: { net_ListenClose( host->fds ); vlc_mutex_destroy( &host->lock ); - vlc_object_destroy( host ); + vlc_object_release( host ); } if( p_tls != NULL ) @@ -1165,14 +1189,17 @@ void httpd_HostDelete( httpd_host_t *host ) free( host->psz_hostname ); 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 ); } @@ -1180,11 +1207,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 ) { @@ -1203,7 +1232,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 : "" ); @@ -1225,7 +1254,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, @@ -1233,7 +1262,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 */ @@ -1281,12 +1310,12 @@ 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; @@ -1305,35 +1334,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 ); } @@ -1379,12 +1393,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 ); @@ -1423,11 +1437,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 ) @@ -1446,77 +1457,116 @@ 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 ); + 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; } } @@ -1540,6 +1590,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 ) { @@ -1547,11 +1610,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 ) ) ) { @@ -1573,28 +1699,6 @@ static void httpd_ClientRecv( httpd_client_t *cl ) } else { - 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 } - }; unsigned i; p = NULL; @@ -1607,7 +1711,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) 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 ) { @@ -1643,12 +1747,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, '?' ) ) ) @@ -1656,23 +1764,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; } } @@ -1731,7 +1822,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; @@ -1748,7 +1840,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 ) @@ -1825,8 +1917,8 @@ 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, psz_status ); for( i = 0; i < cl->answer.i_name; i++ ) @@ -1888,7 +1980,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 */ @@ -1934,26 +2026,36 @@ static void httpd_ClientTlsHsOut( httpd_client_t *cl ) } } -static void httpd_HostThread( httpd_host_t *host ) +static void* httpd_HostThread( vlc_object_t *p_this ) { + httpd_host_t *host = (httpd_host_t *)p_this; 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; + bool b_die; + int canc = vlc_savecancel (); + +retry: + vlc_object_lock( host ); + evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); + b_die = !vlc_object_alive( host ); + vlc_object_unlock( host ); - while( !host->b_die ) + while( !b_die ) { if( host->i_url <= 0 ) { - /* 0.2s */ + /* 0.2s (FIXME: use a condition variable) */ msleep( 200000 ); - continue; + goto retry; } /* 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++ ) { @@ -1965,7 +2067,7 @@ 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 ); 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++ ) { @@ -2040,36 +2142,48 @@ static void httpd_HostThread( httpd_host_t *host ) } else if( i_msg == HTTPD_MSG_OPTIONS ) { - const char *psz; - /* 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->i_body = 0; answer->p_body = NULL; - psz = httpd_MsgGet( query, "Require" ); - if( psz != NULL ) + httpd_MsgAdd( answer, "Server", "%s", PACKAGE_STRING ); + httpd_MsgAdd( answer, "Content-Length", "0" ); + + switch( query->i_proto ) { - answer->i_status = 551; - httpd_MsgAdd( query, "Unsupported", "%s", psz ); - } + case HTTPD_PROTO_HTTP: + answer->i_version = 1; + httpd_MsgAdd( answer, "Allow", + "GET,HEAD,POST,OPTIONS" ); + break; - psz = httpd_MsgGet( query, "Cseq" ); - if( psz != NULL ) - httpd_MsgAdd( answer, "Cseq", "%s", psz ); - psz = httpd_MsgGet( query, "Timestamp" ); - if( psz != NULL ) - httpd_MsgAdd( answer, "Timestamp", "%s", psz ); + 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, "Server", "%s", PACKAGE_STRING ); - httpd_MsgAdd( answer, "Public", "DESCRIBE, SETUP, " - "TEARDOWN, PLAY, PAUSE" ); - httpd_MsgAdd( answer, "Content-Length", "0" ); + 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 */ @@ -2102,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++ ) @@ -2121,7 +2235,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; } } @@ -2157,7 +2271,7 @@ static void httpd_HostThread( httpd_host_t *host ) "Basic realm=\"%s\"", url->psz_user ); /* We fail for all url */ - b_auth_failed = VLC_TRUE; + b_auth_failed = true; free( user ); break; } @@ -2227,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 ) @@ -2244,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 ) ) { @@ -2275,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 { @@ -2311,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 */ @@ -2327,35 +2436,53 @@ 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; } + vlc_object_lock( host ); + if( ufd[nfd - 1].revents ) + { + b_die = !vlc_object_alive( host ); + if( !b_die ) + vlc_object_wait( host ); + } + vlc_object_unlock( host ); + /* 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 @@ -2382,7 +2509,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 ); @@ -2392,18 +2519,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 = accept (fd, NULL, NULL); + if (fd == -1) continue; + net_SetupSocket (fd); if( p_tls != NULL ) { switch( tls_ServerSessionHandshake( p_tls, fd ) ) @@ -2450,140 +2578,6 @@ 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" ); + vlc_restorecancel (canc); 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 */