X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=2e95eedc38ffd0d352de06c6e87bc50101db38dc;hb=c282137c7fb604fc9c5efbc9810c857316c15fac;hp=7bfc071f04a2e7ad0bdd0a3fb1e7a1a81b03e65d;hpb=80ba00a8101b3c8213d9f560a791457a54ec8a12;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index 7bfc071f04..2e95eedc38 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "../libvlc.h" #include @@ -45,10 +46,6 @@ # include #endif -#ifdef HAVE_FCNTL_H -# include -#endif - #ifdef HAVE_POLL # include #endif @@ -460,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 ) @@ -563,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 ); } } @@ -577,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 @@ -591,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 ); @@ -608,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 ) @@ -679,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 ) ) ) { @@ -785,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; @@ -808,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; @@ -829,7 +826,8 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, "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 */ @@ -861,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 ) @@ -882,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; @@ -907,7 +905,7 @@ int httpd_StreamHeader( httpd_stream_t *stream, uint8_t *p_data, int i_data ) 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 ); @@ -1083,6 +1081,8 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, 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 ) { @@ -1126,7 +1126,6 @@ error: if( httpd->i_host <= 0 ) { libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; - vlc_object_detach( httpd ); vlc_object_release( httpd ); } vlc_mutex_unlock( &httpd_mutex ); @@ -1150,15 +1149,19 @@ void httpd_HostDelete( httpd_host_t *host ) { httpd_t *httpd = host->httpd; int i; + bool delete = false; vlc_mutex_lock( &httpd_mutex ); vlc_mutex_lock( &host->lock ); host->i_ref--; if( host->i_ref == 0 ) + { vlc_cond_signal( &host->wait ); + delete = true; + } vlc_mutex_unlock( &host->lock ); - if( host->i_ref > 0 ) + if( !delete ) { /* still used */ vlc_mutex_unlock( &httpd_mutex ); @@ -1202,7 +1205,6 @@ void httpd_HostDelete( httpd_host_t *host ) msg_Dbg( httpd, "no hosts left, stopping httpd" ); libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; - vlc_object_detach( httpd ); vlc_object_release( httpd ); } vlc_mutex_unlock( &httpd_mutex ); @@ -1233,7 +1235,7 @@ 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( &url->lock ); @@ -1401,7 +1403,7 @@ static void httpd_ClientInit( httpd_client_t *cl, mtime_t now ) 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 = false; @@ -1549,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 ); } @@ -1830,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 @@ -1918,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; @@ -2142,7 +2144,7 @@ static void* httpd_HostThread( void *data ) 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 ) @@ -2261,8 +2263,7 @@ static void* httpd_HostThread( void *data ) { httpd_MsgAdd( answer, "WWW-Authenticate", - "Basic realm=\"%s\"", - url->psz_user ); + "Basic realm=\"VLC stream\"" ); /* We fail for all url */ b_auth_failed = true; free( user ); @@ -2362,7 +2363,7 @@ static void* httpd_HostThread( void *data ) 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 @@ -2380,7 +2381,7 @@ static void* httpd_HostThread( void *data ) 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 = false; } @@ -2514,11 +2515,12 @@ static void* httpd_HostThread( void *data ) continue; /* */ - fd = accept (fd, NULL, NULL); + fd = vlc_accept (fd, NULL, NULL, true); if (fd == -1) continue; + setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, + &(int){ 1 }, sizeof(int)); - net_SetupSocket (fd); if( p_tls != NULL ) { switch( tls_ServerSessionHandshake( p_tls, fd ) )