* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#ifdef ENABLE_HTTPD
{ 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" },
{ 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, "" }
};
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 );
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;
}
/*****************************************************************************
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;
}
/*****************************************************************************
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 );
host->i_ref = 1;
{
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 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] == '$' ) )
{
- /* detect type */
- if( cl->p_buffer[0] == '$' )
- {
- /* 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 = 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;
}
}
{
if( cl->i_buffer == cl->i_buffer_size )
{
- char *newbuf = realloc( cl->p_buffer, cl->i_buffer_size + 1024 );
+ uint8_t *newbuf = realloc( cl->p_buffer, cl->i_buffer_size + 1024 );
if( newbuf == NULL )
{
i_len = 0;
}
cl->i_buffer++;
+ if( ( cl->query.i_proto == HTTPD_PROTO_HTTP0 )
+ && ( cl->p_buffer[cl->i_buffer - 1] == '\n' ) )
+ {
+ /* 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 ) ) )
{
*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;
}
}
}
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;
tls_session_t *p_tls = NULL;
counter_t *p_total_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
counter_t *p_active_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
+ int evfd;
+ vlc_bool_t b_die;
+
+ vlc_object_lock( host );
+ evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
+ b_die = !vlc_object_alive( host );
+ vlc_object_unlock( host );
- while( !host->b_die )
+ while( !b_die )
{
if( host->i_url <= 0 )
{
- /* 0.2s */
+ /* 0.2s (FIXME: use a condition variable) */
msleep( 200000 );
continue;
}
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++ )
{
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 */
if (pufd->events != 0)
nfd++;
+ else
+ b_low_delay = VLC_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_wait( host );
+ vlc_object_unlock( host );
+
/* Handle client sockets */
vlc_mutex_lock( &host->lock );
now = mdate();
{
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 ) )
projects / vlc / blobdiff