* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#ifdef ENABLE_HTTPD
#include <assert.h>
httpd_message_t *query )
{
httpd_redirect_t *rdir = (httpd_redirect_t*)p_sys;
+ char *p_body;
if( answer == NULL || query == NULL )
{
answer->i_status = 301;
answer->psz_status = strdup( "Moved Permanently" );
- answer->i_body = asprintf( (char **)&answer->p_body,
+ answer->i_body = asprintf( &p_body,
"<?xml version=\"1.0\" encoding=\"ascii\" ?>\n"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<hr />\n"
"</body>\n"
"</html>\n", rdir->psz_dst );
+ answer->p_body = (unsigned char *)p_body;
/* XXX check if it's ok or we need to set an absolute url */
httpd_MsgAdd( answer, "Location", "%s", rdir->psz_dst );
}
/* 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 );
+ var_Create( p_this->p_libvlc_global, "httpd_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "httpd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !(httpd = vlc_object_find( p_this, VLC_OBJECT_HTTPD, FIND_ANYWHERE )) )
httpd->host = NULL;
vlc_object_yield( httpd );
- vlc_object_attach( httpd, p_this->p_vlc );
+ vlc_object_attach( httpd, p_this->p_libvlc );
}
/* verify if it already exist */
vlc_value_t lockval;
int i;
- var_Get( httpd->p_libvlc, "httpd_mutex", &lockval );
+ var_Get( httpd->p_libvlc_global, "httpd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
host->i_ref--;
for( i = 0; i < host->i_url; i++ )
{
- msg_Err( host, "url still registered:%s", host->url[i]->psz_url );
+ msg_Err( host, "url still registered: %s", host->url[i]->psz_url );
}
for( i = 0; i < host->i_client; i++ )
{
cl->query.i_proto = HTTPD_PROTO_RTSP;
cl->query.i_type = HTTPD_MSG_ANSWER;
}
- else if( !memcmp( cl->p_buffer, "GET", 3 ) ||
+ else if( !memcmp( cl->p_buffer, "GET ", 4 ) ||
!memcmp( cl->p_buffer, "HEAD", 4 ) ||
!memcmp( cl->p_buffer, "POST", 4 ) )
{
}
msg_type[] =
{
- { "GET", HTTPD_MSG_GET, HTTPD_PROTO_HTTP },
- { "HEAD", HTTPD_MSG_HEAD, HTTPD_PROTO_HTTP },
- { "POST", HTTPD_MSG_POST, HTTPD_PROTO_HTTP },
-
- { "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 },
- { "TEARDOWN", HTTPD_MSG_TEARDOWN, HTTPD_PROTO_RTSP },
-
- { NULL, HTTPD_MSG_NONE, HTTPD_PROTO_NONE }
+ { "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;
{
tls_session_t *p_tls = NULL;
- stats_Create( host, "client_connections", STATS_CLIENT_CONNECTIONS,
- VLC_VAR_INTEGER, STATS_COUNTER );
- stats_Create( host, "active_connections", STATS_ACTIVE_CONNECTIONS,
- VLC_VAR_INTEGER, STATS_COUNTER );
+ 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 )
{
cl->i_activity_date+cl->i_activity_timeout < mdate()) ) ) )
{
httpd_ClientClean( cl );
- stats_UpdateInteger( host, STATS_ACTIVE_CONNECTIONS, -1, NULL );
+ stats_UpdateInteger( host, host->p_active_counter, -1, NULL );
TAB_REMOVE( host->i_client, host->client, cl );
free( cl );
i_client--;
if( b64 ) auth = malloc( strlen(b64) + 1 );
else auth = malloc( strlen("") + 1 );
- if( !strncasecmp( b64, "BASIC", 5 ) )
+ if( b64 != NULL
+ && !strncasecmp( b64, "BASIC", 5 ) )
{
b64 += 5;
while( *b64 == ' ' )
/* FIXME: lots of code duplication */
p += sprintf( (char *)p,
- "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
+ "<?xml version=\"1.0\" encoding=\"us-ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n"
"<body>\n"
"<h1>403 Forbidden (%s)</h1>\n"
"<hr />\n"
- "<a href=\"http://www.videolan.org\">VideoLAN</a>\n"
+ "<p><a href=\"http://www.videolan.org\">VideoLAN</a></p>\n"
"</body>\n"
"</html>\n", query->psz_url );
}
answer->psz_status = strdup( "Authorization Required" );
p += sprintf( (char *)p,
- "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
+ "<?xml version=\"1.0\" encoding=\"us-ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n"
"<body>\n"
"<h1>401 Authorization Required (%s)</h1>\n"
"<hr />\n"
- "<a href=\"http://www.videolan.org\">VideoLAN</a>\n"
+ "<p><a href=\"http://www.videolan.org\">VideoLAN</a></p>\n"
"</body>\n"
"</html>\n", query->psz_url );
}
answer->psz_status = strdup( "Not found" );
p += sprintf( (char *)p,
- "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
+ "<?xml version=\"1.0\" encoding=\"us-ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n"
"<body>\n"
"<h1>404 Resource not found(%s)</h1>\n"
"<hr />\n"
- "<a href=\"http://www.videolan.org\">VideoLAN</a>\n"
+ "<p><a href=\"http://www.videolan.org\"> VideoLAN</a></p>\n"
"</body>\n"
"</html>\n", query->psz_url );
}
answer->i_body = p - answer->p_body;
cl->i_buffer = -1; /* Force the creation of the answer in httpd_ClientSend */
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
+ httpd_MsgAdd( answer, "Content-Type", "%s", "text/html" );
}
cl->i_state = HTTPD_CLIENT_SENDING;
if( (i_ret == -1) && (errno != EINTR) )
{
-#if defined(WIN32) || defined(UNDER_CE)
- msg_Warn( host, "cannot select sockets (%d)", WSAGetLastError( ) );
-#else
- msg_Warn( host, "cannot select sockets : %s", strerror( errno ) );
-#endif
+ msg_Warn( host, "select error: %s", net_strerror( net_errno ) );
msleep( 1000 );
continue;
}
struct sockaddr_storage sock;
fd = accept( fd, (struct sockaddr *)&sock, &i_sock_size );
+
if( fd >= 0 )
{
- int i_state = 0;
+ int i_state = 1;
+
+ setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &i_state, sizeof (i_state));
+ i_state = 0;
/* set this new socket non-block */
#if defined( WIN32 ) || defined( UNDER_CE )
ioctlsocket( fd, FIONBIO, &i_dummy );
}
#else
- fcntl( fd, F_SETFL, O_NONBLOCK );
-#endif
+ fcntl( fd, F_SETFD, FD_CLOEXEC );
+ {
+ int i_val = fcntl( fd, F_GETFL );
+ fcntl( fd, F_SETFL,
+ O_NONBLOCK | ((i_val != -1) ? i_val : 0) );
+ }
+ if( fd >= FD_SETSIZE )
+ {
+ net_Close( fd );
+ fd = -1;
+ }
+ else
+#endif
if( p_tls != NULL)
{
switch ( tls_ServerSessionHandshake( p_tls, fd ) )
{
httpd_client_t *cl;
char ip[NI_MAXNUMERICHOST];
- stats_UpdateInteger( host, STATS_CLIENT_CONNECTIONS,
+ stats_UpdateInteger( host, host->p_total_counter,
+ 1, NULL );
+ stats_UpdateInteger( host, host->p_active_counter,
1, NULL );
- stats_UpdateInteger( host, STATS_ACTIVE_CONNECTIONS, 1,
- NULL );
cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );
httpd_ClientIP( cl, ip );
msg_Dbg( host, "Connection from %s", ip );