# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_httpd.h>
-#ifdef ENABLE_HTTPD
-
#include <assert.h>
#include <vlc_network.h>
#include <vlc_tls.h>
#include <vlc_acl.h>
#include <vlc_strings.h>
+#include <vlc_rand.h>
+#include <vlc_charset.h>
#include "../libvlc.h"
#include <string.h>
# include <unistd.h>
#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#ifdef HAVE_POLL
# include <poll.h>
#endif
static void httpd_ClientClean( httpd_client_t *cl );
-struct httpd_t
-{
- VLC_COMMON_MEMBERS
-
- int i_host;
- httpd_host_t **host;
-};
-
-
/* each host run in his own thread */
struct httpd_host_t
{
VLC_COMMON_MEMBERS
- httpd_t *httpd;
-
/* ref count */
- int i_ref;
+ unsigned i_ref;
/* address/port and socket for listening at connections */
- char *psz_hostname;
- int i_port;
int *fds;
unsigned nfd;
+ unsigned port;
+ 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
httpd_client_t **client;
/* TLS data */
- tls_server_t *p_tls;
+ vlc_tls_creds_t *p_tls;
};
{
HTTPD_CLIENT_FILE, /* default */
HTTPD_CLIENT_STREAM, /* regulary get data from cb */
- HTTPD_CLIENT_BIDIR, /* check for reading and get data from cb */
};
struct httpd_client_t
int fd;
- int i_mode;
- int i_state;
- int b_read_waiting; /* stop as soon as possible sending */
+ bool b_stream_mode;
+ uint8_t i_state;
mtime_t i_activity_date;
mtime_t i_activity_timeout;
httpd_message_t answer; /* httpd -> client */
/* TLS data */
- tls_session_t *p_tls;
+ vlc_tls_t *p_tls;
};
/*****************************************************************************
* Various functions
*****************************************************************************/
-static struct
+static const struct
{
const char psz_ext[8];
const char *psz_mime;
{ ".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" },
{ 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" },
- { 458, "Read-only parameter" },*/
+ { 457, "Invalid range" },
+ /*{ 458, "Read-only parameter" },*/
{ 459, "Aggregate operation not allowed" },
{ 460, "Non-aggregate operation not allowed" },
{ 461, "Unsupported transport" },
"<a href=\"http://www.videolan.org\">VideoLAN</a>\n"
"</body>\n"
"</html>\n", errname, code, errname,
- (url ? " (" : ""), (url ?: ""), (url ? ")" : ""));
+ (url ? " (" : ""), (url ? url : ""), (url ? ")" : ""));
if (res == -1)
{
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;
/* 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 )
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 )
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 )
/* We do it ourselves, thanks */
answer->i_status = 0;
- if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
+ if( httpd_ClientIP( cl, psz_remote_addr, NULL ) == 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,
{
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 );
}
}
{
/* 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
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 );
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 )
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 ) ) )
{
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;
if( query->i_type != HTTPD_MSG_HEAD )
{
- httpd_ClientModeStream( cl );
+ cl->b_stream_mode = true;
vlc_mutex_lock( &stream->lock );
/* Send the header */
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;
"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 */
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 )
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;
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 );
/*****************************************************************************
* Low level
*****************************************************************************/
-static void httpd_HostThread( httpd_host_t * );
+static void* httpd_HostThread( void * );
+static httpd_host_t *httpd_HostCreate( vlc_object_t *, const char *,
+ const char *, vlc_tls_creds_t * );
/* create a new host */
-httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host,
- int i_port )
+httpd_host_t *vlc_http_HostNew( vlc_object_t *p_this )
{
- return httpd_TLSHostNew( p_this, psz_host, i_port, NULL, NULL, NULL, NULL
- );
+ return httpd_HostCreate( p_this, "http-host", "http-port", NULL );
}
-static const char psz_object_type[] = "http server";
-
-httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
- int i_port,
- const char *psz_cert, const char *psz_key,
- const char *psz_ca, const char *psz_crl )
+httpd_host_t *vlc_https_HostNew( vlc_object_t *obj )
{
- httpd_t *httpd;
- httpd_host_t *host;
- tls_server_t *p_tls;
- char *psz_host;
- vlc_value_t lockval, ptrval;
- int i;
+ char *cert = var_InheritString( obj, "http-cert" );
+ if( cert == NULL )
+ {
+ msg_Err( obj, "HTTP/TLS certificate not specified!" );
+ return NULL;
+ }
- if( psz_hostname == NULL )
- psz_hostname = "";
+ char *key = var_InheritString( obj, "http-key" );
+ vlc_tls_creds_t *tls = vlc_tls_ServerCreate( obj, cert, key );
- psz_host = strdup( psz_hostname );
- if( psz_host == NULL )
+ if( tls == NULL )
{
- msg_Err( p_this, "memory error" );
+ msg_Err( obj, "HTTP/TLS certificate error (%s and %s)",
+ cert, (key != NULL) ? key : cert );
+ free( key );
+ free( cert );
return NULL;
}
+ free( key );
+ free( cert );
- /* 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;
+ char *ca = var_InheritString( obj, "http-ca" );
+ if( ca != NULL )
+ {
+ if( vlc_tls_ServerAddCA( tls, ca ) )
+ {
+ msg_Err( obj, "HTTP/TLS CA error (%s)", ca );
+ free( ca );
+ goto error;
+ }
+ free( ca );
+ }
- if( httpd == NULL )
+ char *crl = var_InheritString( obj, "http-crl" );
+ if( crl != NULL )
{
- msg_Info( p_this, "creating httpd" );
- httpd = (httpd_t *)vlc_custom_create( p_this, sizeof (*httpd),
- VLC_OBJECT_GENERIC,
- psz_object_type );
- if( httpd == NULL )
+ if( vlc_tls_ServerAddCRL( tls, crl ) )
{
- vlc_mutex_unlock( lockval.p_address );
- free( psz_host );
- return NULL;
+ msg_Err( obj, "TLS CRL error (%s)", crl );
+ free( crl );
+ goto error;
}
+ free( crl );
+ }
- httpd->i_host = 0;
- httpd->host = NULL;
+ return httpd_HostCreate( obj, "http-host", "https-port", tls );
- ptrval.p_address = httpd;
- libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
- vlc_object_yield( httpd );
- vlc_object_attach( httpd, p_this->p_libvlc );
- }
+error:
+ vlc_tls_ServerDelete( tls );
+ return NULL;
+}
+
+httpd_host_t *vlc_rtsp_HostNew( vlc_object_t *p_this )
+{
+ return httpd_HostCreate( p_this, "rtsp-host", "rtsp-port", NULL );
+}
+
+static struct httpd_t
+{
+ vlc_mutex_t mutex;
+
+ httpd_host_t **host;
+ int i_host;
+} httpd = { VLC_STATIC_MUTEX, NULL, 0 };
+
+static httpd_host_t *httpd_HostCreate( vlc_object_t *p_this,
+ const char *hostvar,
+ const char *portvar,
+ vlc_tls_creds_t *p_tls )
+{
+ httpd_host_t *host;
+ unsigned port = var_InheritInteger( p_this, portvar );
+
+ /* to be sure to avoid multiple creation */
+ vlc_mutex_lock( &httpd.mutex );
/* verify if it already exist */
- for( i = httpd->i_host - 1; i >= 0; i-- )
+ for( int i = 0; i < httpd.i_host; i++ )
{
- host = httpd->host[i];
+ host = httpd.host[i];
/* cannot mix TLS and non-TLS hosts */
- if( ( ( httpd->host[i]->p_tls != NULL ) != ( psz_cert != NULL ) )
- || ( host->i_port != i_port )
- || strcmp( host->psz_hostname, psz_hostname ) )
+ if( host->port != port
+ || (host->p_tls != NULL) != (p_tls != NULL) )
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 );
+ vlc_mutex_unlock( &httpd.mutex );
+ if( p_tls != NULL )
+ vlc_tls_ServerDelete( p_tls );
return host;
}
host = NULL;
- /* determine TLS configuration */
- if ( psz_cert != NULL )
- {
- p_tls = tls_ServerCreate( p_this, psz_cert, psz_key );
- if ( p_tls == NULL )
- {
- msg_Err( p_this, "TLS initialization error" );
- goto error;
- }
-
- if ( ( psz_ca != NULL) && tls_ServerAddCA( p_tls, psz_ca ) )
- {
- msg_Err( p_this, "TLS CA error" );
- goto error;
- }
-
- if ( ( psz_crl != NULL) && tls_ServerAddCRL( p_tls, psz_crl ) )
- {
- msg_Err( p_this, "TLS CRL error" );
- goto error;
- }
- }
- else
- p_tls = NULL;
-
/* create the new host */
host = (httpd_host_t *)vlc_custom_create( p_this, sizeof (*host),
- VLC_OBJECT_HTTPD_HOST,
- psz_object_type );
+ "http host" );
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( &host->lock );
+ vlc_cond_init( &host->wait );
host->i_ref = 1;
- host->fds = net_ListenTCP( p_this, psz_host, i_port );
+ char *hostname = var_InheritString( p_this, hostvar );
+ host->fds = net_ListenTCP( p_this, hostname, port );
+ free( hostname );
if( host->fds == NULL )
{
msg_Err( p_this, "cannot create socket(s) for HTTP host" );
}
for (host->nfd = 0; host->fds[host->nfd] != -1; host->nfd++);
- host->i_port = i_port;
- host->psz_hostname = psz_host;
-
- host->i_url = 0;
- host->url = NULL;
- host->i_client = 0;
- host->client = NULL;
+ if( vlc_object_waitpipe( VLC_OBJECT( host ) ) == -1 )
+ {
+ msg_Err( host, "signaling pipe error: %m" );
+ goto error;
+ }
- host->p_tls = p_tls;
+ host->port = port;
+ host->i_url = 0;
+ host->url = NULL;
+ host->i_client = 0;
+ host->client = NULL;
+ host->p_tls = p_tls;
/* create the thread */
- if( vlc_thread_create( host, "httpd host thread", httpd_HostThread,
- VLC_THREAD_PRIORITY_LOW, false ) )
+ if( vlc_clone( &host->thread, httpd_HostThread, host,
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_this, "cannot spawn http host thread" );
goto error;
}
/* now add it to httpd */
- TAB_APPEND( httpd->i_host, httpd->host, host );
- vlc_mutex_unlock( lockval.p_address );
+ TAB_APPEND( httpd.i_host, httpd.host, host );
+ vlc_mutex_unlock( &httpd.mutex );
return host;
error:
- free( psz_host );
- if( httpd->i_host <= 0 )
- {
- vlc_object_release( httpd );
- vlc_object_detach( httpd );
- vlc_object_release( httpd );
- }
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd.mutex );
if( host != NULL )
{
net_ListenClose( host->fds );
+ vlc_cond_destroy( &host->wait );
vlc_mutex_destroy( &host->lock );
vlc_object_release( host );
}
if( p_tls != NULL )
- tls_ServerDelete( p_tls );
+ vlc_tls_ServerDelete( p_tls );
return NULL;
}
/* delete a host */
void httpd_HostDelete( httpd_host_t *host )
{
- httpd_t *httpd = host->httpd;
- vlc_value_t lockval;
int i;
+ bool delete = false;
- var_Get( httpd->p_libvlc, "httpd_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( &httpd.mutex );
+ vlc_mutex_lock( &host->lock );
host->i_ref--;
- if( host->i_ref > 0 )
+ if( host->i_ref == 0 )
+ {
+ vlc_cond_signal( &host->wait );
+ delete = true;
+ }
+ vlc_mutex_unlock( &host->lock );
+ if( !delete )
{
/* still used */
- vlc_mutex_unlock( lockval.p_address );
- msg_Dbg( host, "httpd_HostDelete: host still used" );
+ vlc_mutex_unlock( &httpd.mutex );
+ msg_Dbg( host, "httpd_HostDelete: host still in use" );
return;
}
- TAB_REMOVE( httpd->i_host, httpd->host, host );
+ TAB_REMOVE( httpd.i_host, httpd.host, host );
vlc_object_kill( host );
- vlc_thread_join( host );
+ vlc_join( host->thread, NULL );
msg_Dbg( host, "HTTP host removed" );
}
if( host->p_tls != NULL)
- tls_ServerDelete( host->p_tls );
+ vlc_tls_ServerDelete( host->p_tls );
net_ListenClose( host->fds );
- free( host->psz_hostname );
-
+ vlc_cond_destroy( &host->wait );
vlc_mutex_destroy( &host->lock );
vlc_object_release( host );
-
- vlc_object_release( httpd );
- if( httpd->i_host <= 0 )
- {
- vlc_value_t ptrval;
-
- msg_Dbg( httpd, "no host left, stopping httpd" );
-
- libvlc_priv (httpd->p_libvlc)->p_httpd = NULL;
- vlc_object_detach( httpd );
- vlc_object_release( httpd );
-
- }
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( &httpd.mutex );
}
/* register a new url */
{
if( !strcmp( psz_url, host->url[i]->psz_url ) )
{
- msg_Warn( host->httpd,
+ msg_Warn( host,
"cannot add '%s' (url already defined)", psz_url );
vlc_mutex_unlock( &host->lock );
return NULL;
}
}
- url = malloc( sizeof( httpd_url_t ) );
+ url = xmalloc( sizeof( httpd_url_t ) );
url->host = host;
vlc_mutex_init( &url->lock );
}
TAB_APPEND( host->i_url, host->url, url );
+ vlc_cond_signal( &host->wait );
vlc_mutex_unlock( &host->lock );
return url;
return VLC_SUCCESS;
}
-/* delete an url */
+/* delete a url */
void httpd_UrlDelete( httpd_url_t *url )
{
httpd_host_t *host = url->host;
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->psz_url = NULL;
msg->psz_args = NULL;
- msg->i_channel = -1;
-
msg->i_name = 0;
msg->name = NULL;
msg->i_value = 0;
msg->p_body = NULL;
}
-void httpd_MsgClean( httpd_message_t *msg )
+static void httpd_MsgClean( httpd_message_t *msg )
{
int i;
char *value = NULL;
va_start( args, psz_value );
- if( vasprintf( &value, psz_value, args ) == -1 )
+ if( us_vasprintf( &value, psz_value, args ) == -1 )
value = NULL;
va_end( args );
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 = false;
+ cl->p_buffer = xmalloc( cl->i_buffer_size );
+ cl->b_stream_mode = false;
httpd_MsgInit( &cl->query );
httpd_MsgInit( &cl->answer );
}
-void httpd_ClientModeStream( httpd_client_t *cl )
-{
- cl->i_mode = HTTPD_CLIENT_STREAM;
-}
-
-void httpd_ClientModeBidir( httpd_client_t *cl )
+char* httpd_ClientIP( const httpd_client_t *cl, char *ip, int *port )
{
- cl->i_mode = HTTPD_CLIENT_BIDIR;
+ return net_GetPeerAddress( cl->fd, ip, port ) ? NULL : ip;
}
-char* httpd_ClientIP( const httpd_client_t *cl, char *psz_ip )
+char* httpd_ServerIP( const httpd_client_t *cl, char *ip, int *port )
{
- return net_GetPeerAddress( cl->fd, psz_ip, NULL ) ? NULL : psz_ip;
-}
-
-char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip )
-{
- return net_GetSockAddress( cl->fd, psz_ip, NULL ) ? NULL : psz_ip;
+ return net_GetSockAddress( cl->fd, ip, port ) ? NULL : ip;
}
static void httpd_ClientClean( httpd_client_t *cl )
if( cl->fd >= 0 )
{
if( cl->p_tls != NULL )
- tls_ServerSessionClose( cl->p_tls );
+ vlc_tls_ServerSessionDelete( cl->p_tls );
net_Close( cl->fd );
cl->fd = -1;
}
cl->p_buffer = NULL;
}
-static httpd_client_t *httpd_ClientNew( int fd, tls_session_t *p_tls, mtime_t now )
+static httpd_client_t *httpd_ClientNew( int fd, vlc_tls_t *p_tls, mtime_t now )
{
httpd_client_t *cl = malloc( sizeof( httpd_client_t ) );
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;
+ vlc_tls_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;
+ vlc_tls_t *p_tls;
+ ssize_t val;
p_tls = cl->p_tls;
- if( p_tls != NULL)
- return tls_Send( p_tls, p, i_len );
-
- return send( cl->fd, p, i_len, 0 );
+ 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;
}
cl->i_buffer += i_len;
}
- if( ( cl->i_buffer >= 4 ) && ( 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 -= 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 )
{
*p2++ = '\0';
}
- if( !strncasecmp( p, "rtsp:", 5 ) )
- {
- /* for rtsp url, you have rtsp://localhost:port/path */
+ if( !strncasecmp( p, ( cl->query.i_proto
+ == HTTPD_PROTO_HTTP ) ? "http:" : "rtsp:", 5 ) )
+ { /* Skip hier-part of URL (if present) */
p += 5;
- while( *p == '/' ) p++;
- while( *p && *p != '/' ) p++;
+ if( !strncmp( p, "//", 2 ) ) /* skip authority */
+ { /* see RFC3986 §3.2 */
+ p += 2;
+ p += strcspn( p, "/?#" );
+ }
+ }
+ else
+ if( !strncasecmp( p, ( cl->query.i_proto
+ == HTTPD_PROTO_HTTP ) ? "https:" : "rtsps:", 6 ) )
+ { /* Skip hier-part of URL (if present) */
+ p += 6;
+ if( !strncmp( p, "//", 2 ) ) /* skip authority */
+ { /* see RFC3986 §3.2 */
+ p += 2;
+ p += strcspn( p, "/?#" );
+ }
}
+
cl->query.psz_url = strdup( p );
if( ( p3 = strchr( cl->query.psz_url, '?' ) ) )
{
}
if( cl->query.i_body > 0 )
{
- /* TODO Mhh, handle the case client will only send a
- * request and close the connection
- * to mark and of body (probably only RTSP) */
+ /* TODO Mhh, handle the case where the client only
+ * sends a request and closes the connection to
+ * mark the end of the body (probably only RTSP) */
cl->query.p_body = malloc( cl->query.i_body );
cl->i_buffer = 0;
+ if ( cl->query.p_body == NULL )
+ {
+ switch (cl->query.i_proto)
+ {
+ case HTTPD_PROTO_HTTP:
+ {
+ const uint8_t sorry[] =
+ "HTTP/1.1 413 Request Entity Too Large\r\n\r\n";
+ httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 );
+ break;
+ }
+ case HTTPD_PROTO_RTSP:
+ {
+ const uint8_t sorry[] =
+ "RTSP/1.0 413 Request Entity Too Large\r\n\r\n";
+ httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 );
+ break;
+ }
+ default:
+ assert( 0 );
+ }
+ i_len = 0; /* drop */
+ }
+ break;
}
else
{
#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 )
{
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;
if( cl->i_buffer >= cl->i_buffer_size )
{
- if( cl->answer.i_body == 0 && cl->answer.i_body_offset > 0 &&
- !cl->b_read_waiting )
+ if( cl->answer.i_body == 0 && cl->answer.i_body_offset > 0 )
{
/* catch more body data */
int i_msg = cl->query.i_type;
#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 */
static void httpd_ClientTlsHsIn( httpd_client_t *cl )
{
- switch( tls_SessionContinueHandshake( cl->p_tls ) )
+ switch( vlc_tls_ServerSessionHandshake( cl->p_tls ) )
{
case 0:
cl->i_state = HTTPD_CLIENT_RECEIVING;
static void httpd_ClientTlsHsOut( httpd_client_t *cl )
{
- switch( tls_SessionContinueHandshake( cl->p_tls ) )
+ switch( vlc_tls_ServerSessionHandshake( cl->p_tls ) )
{
case 0:
cl->i_state = HTTPD_CLIENT_RECEIVING;
}
}
-static void httpd_HostThread( httpd_host_t *host )
+static void* httpd_HostThread( void *data )
{
- tls_session_t *p_tls = NULL;
+ httpd_host_t *host = data;
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 evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
- vlc_object_lock( host );
- evfd = vlc_object_waitpipe( VLC_OBJECT( host ) );
- b_die = !vlc_object_alive( host );
- vlc_object_unlock( host );
-
- while( !b_die )
+ for( ;; )
{
- if( host->i_url <= 0 )
- {
- /* 0.2s (FIXME: use a condition variable) */
- 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 + 1];
unsigned nfd;
for( nfd = 0; nfd < host->nfd; nfd++ )
/* 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();
bool b_low_delay = false;
httpd_MsgInit( answer );
/* Handle what we received */
- if( (cl->i_mode != HTTPD_CLIENT_BIDIR) &&
- (i_msg == HTTPD_MSG_ANSWER || i_msg == HTTPD_MSG_CHANNEL) )
+ if( i_msg == HTTPD_MSG_ANSWER )
{
- /* we can only receive request from client when not
- * in BIDIR mode */
cl->url = NULL;
cl->i_state = HTTPD_CLIENT_DEAD;
}
- else if( i_msg == HTTPD_MSG_ANSWER )
- {
- /* We are in BIDIR mode, trigger the callback and then
- * check for new data */
- if( cl->url && cl->url->catch[i_msg].cb )
- {
- cl->url->catch[i_msg].cb( cl->url->catch[i_msg].p_sys,
- cl, NULL, query );
- }
- cl->i_state = HTTPD_CLIENT_WAITING;
- }
- else if( i_msg == HTTPD_MSG_CHANNEL )
- {
- /* We are in BIDIR mode, trigger the callback and then
- * check for new data */
- if( cl->url && cl->url->catch[i_msg].cb )
- {
- cl->url->catch[i_msg].cb( cl->url->catch[i_msg].p_sys,
- cl, NULL, query );
- }
- cl->i_state = HTTPD_CLIENT_WAITING;
- }
else if( i_msg == HTTPD_MSG_OPTIONS )
{
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 )
{
char ip[NI_MAXNUMERICHOST];
- if( ( httpd_ClientIP( cl, ip ) == NULL )
+ if( ( httpd_ClientIP( cl, ip, NULL ) == NULL )
|| ACL_Check( url->p_acl, ip ) )
{
b_hosts_failed = true;
{
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 );
}
else if( cl->i_state == HTTPD_CLIENT_SEND_DONE )
{
- if( cl->i_mode == HTTPD_CLIENT_FILE || cl->answer.i_body_offset == 0 )
+ if( !cl->b_stream_mode || cl->answer.i_body_offset == 0 )
{
const char *psz_connection = httpd_MsgGet( &cl->answer, "Connection" );
const char *psz_query = httpd_MsgGet( &cl->query, "Connection" );
}
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 ) )
{
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
}
httpd_MsgClean( &cl->answer );
}
- else if( cl->b_read_waiting )
- {
- /* we have a message waiting for us to read it */
- httpd_MsgClean( &cl->answer );
- httpd_MsgClean( &cl->query );
-
- cl->i_buffer = 0;
- cl->i_buffer_size = 1000;
- free( cl->p_buffer );
- cl->p_buffer = malloc( cl->i_buffer_size );
- cl->i_state = HTTPD_CLIENT_RECEIVING;
- cl->b_read_waiting = false;
- }
else
{
int64_t i_offset = cl->answer.i_body_offset;
}
}
- /* Special for BIDIR mode we also check reading */
- if( cl->i_mode == HTTPD_CLIENT_BIDIR &&
- cl->i_state == HTTPD_CLIENT_SENDING )
- {
- pufd->events |= POLLIN;
- }
-
if (pufd->events != 0)
nfd++;
else
continue;
}
- vlc_object_lock( host );
if( ufd[nfd - 1].revents )
- {
- b_die = !vlc_object_alive( host );
- if( !b_die )
- b_die = vlc_object_wait( host );
- }
- vlc_object_unlock( host );
+ break;
/* 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
{
httpd_ClientTlsHsOut( cl );
}
-
- if( cl->i_mode == HTTPD_CLIENT_BIDIR &&
- cl->i_state == HTTPD_CLIENT_SENDING &&
- (pufd->revents & POLLIN) )
- {
- cl->b_read_waiting = true;
- }
}
vlc_mutex_unlock( &host->lock );
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));
+
+ vlc_tls_t *p_tls;
- net_SetupSocket (fd);
- if( p_tls != NULL )
+ if( host->p_tls != NULL )
{
- switch( tls_ServerSessionHandshake( p_tls, fd ) )
+ p_tls = vlc_tls_ServerSessionCreate( host->p_tls, fd );
+ switch( vlc_tls_ServerSessionHandshake( p_tls ) )
{
case -1:
msg_Err( host, "Rejecting TLS connection" );
+ /* p_tls is destroyed implicitly */
net_Close( fd );
fd = -1;
p_tls = NULL;
- break;
+ continue;
case 1: /* missing input - most likely */
i_state = HTTPD_CLIENT_TLS_HS_IN;
i_state = HTTPD_CLIENT_TLS_HS_OUT;
break;
}
-
- if( (p_tls == NULL) != (host->p_tls == NULL) )
- break; // wasted TLS session, cannot accept() anymore
}
+ else
+ p_tls = NULL;
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
-
- if (host->p_tls != NULL)
- break; // cannot accept further without new TLS session
}
}
- 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 );
-}
-
-#else /* ENABLE_HTTPD */
-
-/* We just define an empty wrapper */
-httpd_host_t *httpd_TLSHostNew( vlc_object_t *a, const char *b,
- int c,
- const char *e, const char *f,
- const char *g, const char* h)
-{
- msg_Err( a, "HTTP daemon support is disabled" );
- return NULL;
-}
-
-httpd_host_t *httpd_HostNew( vlc_object_t *a, const 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, const char *psz_url,
- const char *psz_user, const char *psz_password,
- const vlc_acl_t *p_acl )
-{
- return NULL;
-}
-
-httpd_url_t *httpd_UrlNewUnique( httpd_host_t *host, const char *psz_url,
- const char *psz_user, const 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( const httpd_client_t *cl, char *psz_ip )
-{
- return NULL;
-}
-
-char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip )
-{
- return NULL;
-}
-
-void httpd_ClientModeStream( httpd_client_t *a )
-{
-}
-
-void httpd_ClientModeBidir( httpd_client_t *a )
-{
-}
-
-httpd_file_sys_t *httpd_FileDelete( httpd_file_t *file )
-{
- return NULL;
-}
-
-httpd_file_t *httpd_FileNew( httpd_host_t *host,
- const char *psz_url, const char *psz_mime,
- const char *psz_user, const char *psz_password,
- const vlc_acl_t *p_acl, httpd_file_callback_t pf_fill,
- httpd_file_sys_t *p_sys )
-{
- 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;
}
-
-httpd_handler_sys_t *httpd_HandlerDelete( httpd_handler_t *handler )
-{
- return NULL;
-}
-
-void httpd_RedirectDelete( httpd_redirect_t *a )
-{
-}
-
-httpd_redirect_t *httpd_RedirectNew( httpd_host_t *host, const char *psz_url_dst,
- const char *psz_url_src )
-{
- 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 *host,
- const char *psz_url, const char *psz_mime,
- const char *psz_user, const char *psz_password,
- const vlc_acl_t *p_acl )
-{
- 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( const httpd_message_t *msg, const char *name )
-{
- return "";
-}
-
-void httpd_MsgClean( httpd_message_t *a )
-{
-}
-
-#endif /* ENABLE_HTTPD */
projects / vlc / blobdiff