/*****************************************************************************
* httpd.c
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Remi Denis-Courmont <courmisch@via.ecp.fr>
+ * Remi Denis-Courmont <rem # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <stdlib.h>
#include <vlc/vlc.h>
+#ifdef ENABLE_HTTPD
+
#include "vlc_httpd.h"
#include "network.h"
+#include "vlc_tls.h"
#include <string.h>
#include <errno.h>
+
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include <fcntl.h>
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
#if defined( UNDER_CE )
# include <winsock.h>
# endif
#endif
+#if defined(WIN32) && !defined(UNDER_CE)
+static const struct in6_addr in6addr_any = {{IN6ADDR_ANY_INIT}};
+#elif defined(UNDER_CE) && defined(AF_INET6)
+# undef AF_INET6
+#endif
+
+#ifndef PF_INET
+# define PF_INET AF_INET /* BeOS */
+#endif
+
#if 0
typedef struct httpd_t httpd_t;
int i_client;
httpd_client_t **client;
+
+ /* TLS data */
+ tls_server_t *p_tls;
};
struct httpd_url_t
HTTPD_CLIENT_WAITING,
HTTPD_CLIENT_DEAD,
+
+ HTTPD_CLIENT_TLS_HS_IN,
+ HTTPD_CLIENT_TLS_HS_OUT
};
/* mode */
enum
/* */
httpd_message_t query; /* client -> httpd */
httpd_message_t answer; /* httpd -> client */
+
+ /* TLS data */
+ tls_session_t *p_tls;
};
{ ".jpg", "image/jpeg" },
{ ".jpeg", "image/jpeg" },
{ ".png", "image/png" },
+ { ".mpjpeg","multipart/x-mixed-replace; boundary=This Random String" },
/* media mime */
{ ".avi", "video/avi" },
*****************************************************************************/
#define LISTEN_BACKLOG 100
-#if defined(HAVE_GETNAMEINFO) && !defined(HAVE_GETADDRINFO)
-/*
- * For now, VLC's configure script does not check for getaddrinfo(),
- * but it should be present if getnameinfo() is (the opposite is untrue, with
- * Debian potato as an example)
- */
-# define HAVE_GETADDRINFO 1
-#endif
-
static void httpd_HostThread( httpd_host_t * );
static int GetAddrPort( const struct sockaddr_storage *p_ss );
/* create a new host */
-httpd_host_t *httpd_HostNew( vlc_object_t *p_this, char *psz_host, int i_port )
+httpd_host_t *httpd_HostNew( vlc_object_t *p_this, char *psz_host,
+ int i_port )
+{
+ return httpd_TLSHostNew( p_this, psz_host, i_port, NULL );
+}
+
+httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, char *psz_host,
+ int i_port, tls_server_t *p_tls )
{
httpd_t *httpd;
httpd_host_t *host = NULL;
/* resolv */
#ifdef HAVE_GETADDRINFO
-
{
vlc_value_t val;
char psz_port[6];
struct addrinfo hints;
-
+ int check;
+
memset( &hints, 0, sizeof( hints ) );
-#if 0
- /* Check if we have force ipv4 or ipv6 */
+
+ /* Check if ipv4 or ipv6 were forced */
var_Create( p_this, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_this, "ipv4", &val );
if( val.b_bool )
hints.ai_family = PF_INET;
-#else
- /*
- * For now, keep IPv4 by default. That said, it should be safe to use
- * IPv6 by default *on the server side*, as, apart from NetBSD, most
- * systems accept IPv4 clients on IPv6 listening sockets.
- *
- *
- */
- hints.ai_family = PF_INET;
-#endif
var_Create( p_this, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_this, "ipv6", &val );
snprintf( psz_port, sizeof( psz_port ), "%d", i_port );
psz_port[sizeof( psz_port ) - 1] = '\0';
- if( getaddrinfo( psz_host, psz_port, &hints, &res ) )
+ check = getaddrinfo( psz_host, psz_port, &hints, &res );
+ if( check != 0 )
{
+#ifdef HAVE_GAI_STRERROR
+ msg_Err( p_this, "cannot resolve %s:%d : %s", psz_host, i_port,
+ gai_strerror( check ) );
+#else
msg_Err( p_this, "cannot resolve %s:%d", psz_host, i_port );
+#endif
return NULL;
}
}
+
#else
struct sockaddr_in sock;
struct httpd_addrinfo info;
/* verify if it already exist */
for( i = 0; i < httpd->i_host; i++ )
{
- if (GetAddrPort (&httpd->host[i]->sock) != i_port)
+ if( GetAddrPort (&httpd->host[i]->sock) != i_port )
+ continue;
+
+ /* Cannot re-use host if it uses TLS/SSL */
+ if( httpd->host[i]->p_tls != NULL )
continue;
#ifdef AF_INET6
if( httpd->host[i]->sock.ss_family == AF_INET6 )
{
- const struct sockaddr_in6 *p_hsock, *p_sock;
-
- p_hsock = (const struct sockaddr_in6 *)&httpd->host[i]->sock;
- p_sock = (const struct sockaddr_in6 *)res->ai_addr;
-
- if( memcmp( &p_hsock->sin6_addr, &in6addr_any,
- sizeof( struct in6_addr ) ) &&
- ( p_sock->sin6_family != AF_INET6 ||
- memcmp( &p_hsock->sin6_addr, &p_sock->sin6_addr,
- sizeof( struct in6_addr ) ) ) )
- continue; /* does not match */
+ const struct sockaddr_in6 *p_hsock, *p_sock;
+
+ p_hsock = (const struct sockaddr_in6 *)&httpd->host[i]->sock;
+ p_sock = (const struct sockaddr_in6 *)ptr->ai_addr;
+
+ if( memcmp( &p_hsock->sin6_addr, &in6addr_any,
+ sizeof( struct in6_addr ) ) &&
+ ( p_sock->sin6_family != AF_INET6 ||
+ memcmp( &p_hsock->sin6_addr, &p_sock->sin6_addr,
+ sizeof( struct in6_addr ) ) ) )
+ continue; /* does not match */
}
- else
- if( res->ai_family == PF_INET6 )
+ else if( ptr->ai_family == PF_INET6 )
continue;
else
#endif
if( httpd->host[i]->sock.ss_family == AF_INET )
{
- const struct sockaddr_in *p_hsock, *p_sock;
-
- p_hsock = (const struct sockaddr_in *)&httpd->host[i]->sock;
- p_sock = (const struct sockaddr_in *)res->ai_addr;
+ const struct sockaddr_in *p_hsock, *p_sock;
+
+ p_hsock = (const struct sockaddr_in *)&httpd->host[i]->sock;
+ p_sock = (const struct sockaddr_in *)ptr->ai_addr;
- if( p_hsock->sin_addr.s_addr != INADDR_ANY &&
- ( p_sock->sin_family != AF_INET ||
- p_hsock->sin_addr.s_addr != p_sock->sin_addr.s_addr ) )
- continue; /* does not match */
+ if( p_hsock->sin_addr.s_addr != INADDR_ANY &&
+ ( p_sock->sin_family != AF_INET ||
+ p_hsock->sin_addr.s_addr != p_sock->sin_addr.s_addr ) )
+ continue; /* does not match */
}
- else
- if( res->ai_family == PF_INET )
+ else if( ptr->ai_family == PF_INET )
continue;
else
{
}
/* create the listening socket */
- fd = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
- if( fd < 0 )
+ fd = socket( ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol );
+ if( fd == -1 )
continue;
/* reuse socket */
}
/* bind it */
- if( bind( fd, res->ai_addr, res->ai_addrlen ) )
+ if( bind( fd, ptr->ai_addr, ptr->ai_addrlen ) )
{
msg_Err( p_this, "cannot bind socket" );
- continue;
+ goto socket_error;
}
/* set to non-blocking */
#if defined( WIN32 ) || defined( UNDER_CE )
if( ioctlsocket( fd, FIONBIO, &i_dummy ) != 0 )
{
msg_Err( p_this, "cannot set socket to non-blocking mode" );
- continue;
+ goto socket_error;
}
}
#else
if( ( i_flags = fcntl( fd, F_GETFL, 0 ) ) < 0 )
{
msg_Err( p_this, "cannot F_GETFL socket" );
- continue;
+ goto socket_error;
}
if( fcntl( fd, F_SETFL, i_flags | O_NONBLOCK ) < 0 )
{
msg_Err( p_this, "cannot F_SETFL O_NONBLOCK" );
- continue;
+ goto socket_error;
}
}
#endif
if( listen( fd, LISTEN_BACKLOG ) < 0 )
{
msg_Err( p_this, "cannot listen socket" );
- continue;
+ goto socket_error;
}
+
+ break; // success
+
+socket_error:
+ net_Close( fd );
+ fd = -1;
}
- freeaddrinfo( res );
if( fd == -1 )
+ {
+ freeaddrinfo( res );
goto error;
+ }
/* create the new host */
host = vlc_object_create( p_this, sizeof( httpd_host_t ) );
host->i_ref = 1;
host->fd = fd;
- memcpy( &host->sock, res->ai_addr, res->ai_addrlen );
- host->i_sock_size = res->ai_addrlen;
+ memcpy( &host->sock, ptr->ai_addr, ptr->ai_addrlen );
+ host->i_sock_size = ptr->ai_addrlen;
host->i_url = 0;
host->url = NULL;
host->i_client = 0;
host->client = NULL;
-
+
+ freeaddrinfo( res );
+ host->p_tls = p_tls;
+
/* create the thread */
if( vlc_thread_create( host, "httpd host thread", httpd_HostThread,
VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
/* TODO */
}
+ if( host->p_tls != NULL)
+ tls_ServerDelete( host->p_tls );
net_Close( host->fd );
vlc_mutex_destroy( &host->lock );
vlc_object_destroy( host );
{
cl->i_state = HTTPD_CLIENT_RECEIVING;
cl->i_activity_date = mdate();
- cl->i_activity_timeout = 50000000;
+ cl->i_activity_timeout = I64C(10000000);
cl->i_buffer_size = 10000;
cl->i_buffer = 0;
cl->p_buffer = malloc( cl->i_buffer_size );
/* FIXME: msg_Err */
return NULL;
- fprintf( stderr, "ClientIP = %s\n", &sz_ip[1]);
-
if( strchr( &sz_ip[1], ':' ) != NULL )
{
*sz_ip = '[';
sz_ip[i++] = ']';
sz_ip[i] = '\0';
- fprintf( stderr, "ClientIP (with []) = %s\n", sz_ip);
return strdup( sz_ip );
}
return strdup( &sz_ip[1] );
-#else
+
+#else
/* FIXME not thread safe */
return strdup( inet_ntoa( ((const struct sockaddr_in *)&cl->sock)->sin_addr ) );
#endif
static void httpd_ClientClean( httpd_client_t *cl )
{
- if( cl->fd > 0 )
+ if( cl->fd >= 0 )
{
+ if( cl->p_tls != NULL )
+ tls_ServerSessionClose( cl->p_tls );
net_Close( cl->fd );
cl->fd = -1;
}
}
static httpd_client_t *httpd_ClientNew( int fd, struct sockaddr_storage *sock,
- int i_sock_size )
+ int i_sock_size,
+ tls_session_t *p_tls )
{
httpd_client_t *cl = malloc( sizeof( httpd_client_t ) );
- /* set this new socket non-block */
-#if defined( WIN32 ) || defined( UNDER_CE )
- {
- unsigned long i_dummy = 1;
- ioctlsocket( fd, FIONBIO, &i_dummy );
- }
-#else
- fcntl( fd, F_SETFL, O_NONBLOCK );
-#endif
cl->i_ref = 0;
cl->fd = fd;
memcpy( &cl->sock, sock, sizeof( cl->sock ) );
cl->i_sock_size = i_sock_size;
cl->url = NULL;
+ cl->p_tls = p_tls;
httpd_ClientInit( cl );
return cl;
}
+
+static int httpd_NetRecv( httpd_client_t *cl, char *p, int i_len )
+{
+ tls_session_t *p_tls;
+
+ 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 );
+}
+
+
+static int httpd_NetSend( httpd_client_t *cl, const char *p, int i_len )
+{
+ tls_session_t *p_tls;
+
+ 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 );
+}
+
+
static void httpd_ClientRecv( httpd_client_t *cl )
{
int i_len;
if( cl->query.i_proto == HTTPD_PROTO_NONE )
{
/* enought to see if it's rtp over rtsp or RTSP/HTTP */
- i_len = recv( cl->fd, &cl->p_buffer[cl->i_buffer], 4 - cl->i_buffer, 0 );
-
+ i_len = httpd_NetRecv( cl, &cl->p_buffer[cl->i_buffer],
+ 4 - cl->i_buffer );
if( i_len > 0 )
{
cl->i_buffer += i_len;
else if( cl->query.i_body > 0 )
{
/* we are reading the body of a request or a channel */
- i_len = recv( cl->fd, &cl->query.p_body[cl->i_buffer],
- cl->query.i_body - cl->i_buffer, 0 );
+ i_len = httpd_NetRecv( cl, &cl->query.p_body[cl->i_buffer],
+ cl->query.i_body - cl->i_buffer );
if( i_len > 0 )
{
cl->i_buffer += i_len;
/* we are reading a header -> char by char */
for( ;; )
{
- i_len = recv( cl->fd, &cl->p_buffer[cl->i_buffer], 1, 0 );
+ i_len = httpd_NetRecv (cl, &cl->p_buffer[cl->i_buffer], 1 );
if( i_len <= 0 )
{
break;
}
cl->i_activity_date = mdate();
+ /* XXX: for QT I have to disable timeout. Try to find why */
+ if( cl->query.i_proto == HTTPD_PROTO_RTSP )
+ cl->i_activity_timeout = 0;
+
/* Debugging only */
if( cl->i_state == HTTPD_CLIENT_RECEIVE_DONE )
{
}
}
+
static void httpd_ClientSend( httpd_client_t *cl )
{
int i;
fprintf( stderr, "%s", cl->p_buffer );
}
- i_len = send( cl->fd, &cl->p_buffer[cl->i_buffer],
- cl->i_buffer_size - cl->i_buffer, 0 );
+ i_len = httpd_NetSend( cl, &cl->p_buffer[cl->i_buffer],
+ cl->i_buffer_size - cl->i_buffer );
if( i_len > 0 )
{
cl->i_activity_date = mdate();
}
}
+static void httpd_ClientTlsHsIn( httpd_client_t *cl )
+{
+ switch( tls_SessionContinueHandshake( cl->p_tls ) )
+ {
+ case 0:
+ cl->i_state = HTTPD_CLIENT_RECEIVING;
+ break;
+
+ case -1:
+ cl->i_state = HTTPD_CLIENT_DEAD;
+ cl->p_tls = NULL;
+ break;
+
+ case 2:
+ cl->i_state = HTTPD_CLIENT_TLS_HS_OUT;
+ }
+}
+
+static void httpd_ClientTlsHsOut( httpd_client_t *cl )
+{
+ switch( tls_SessionContinueHandshake( cl->p_tls ) )
+ {
+ case 0:
+ cl->i_state = HTTPD_CLIENT_RECEIVING;
+ break;
+
+ case -1:
+ cl->i_state = HTTPD_CLIENT_DEAD;
+ cl->p_tls = NULL;
+ break;
+
+ case 1:
+ cl->i_state = HTTPD_CLIENT_TLS_HS_IN;
+ break;
+ }
+}
+
static void httpd_HostThread( httpd_host_t *host )
{
+ tls_session_t *p_tls = NULL;
+
while( !host->b_die )
{
struct timeval timeout;
FD_SET( host->fd, &fds_read );
i_handle_max = host->fd;
+ /* prepare a new TLS session */
+ if( ( p_tls == NULL ) && ( host->p_tls != NULL ) )
+ p_tls = tls_ServerSessionPrepare( host->p_tls );
+
/* add all socket that should be read/write and close dead connection */
vlc_mutex_lock( &host->lock );
for( i_client = 0; i_client < host->i_client; i_client++ )
if( cl->i_ref < 0 || ( cl->i_ref == 0 &&
( cl->i_state == HTTPD_CLIENT_DEAD ||
- cl->i_activity_date + cl->i_activity_timeout < mdate() ) ) )
+ ( cl->i_activity_timeout > 0 &&
+ cl->i_activity_date+cl->i_activity_timeout < mdate()) ) ) )
{
char *ip;
i_client--;
continue;
}
- else if( cl->i_state == HTTPD_CLIENT_RECEIVING )
+ else if( ( cl->i_state == HTTPD_CLIENT_RECEIVING )
+ || ( cl->i_state == HTTPD_CLIENT_TLS_HS_IN ) )
{
FD_SET( cl->fd, &fds_read );
i_handle_max = __MAX( i_handle_max, cl->fd );
}
- else if( cl->i_state == HTTPD_CLIENT_SENDING )
+ else if( ( cl->i_state == HTTPD_CLIENT_SENDING )
+ || ( cl->i_state == HTTPD_CLIENT_TLS_HS_OUT ) )
{
FD_SET( cl->fd, &fds_write );
i_handle_max = __MAX( i_handle_max, cl->fd );
p += sprintf( p, "<title>Error 404</title>\n" );
p += sprintf( p, "</head>\n" );
p += sprintf( p, "<body>\n" );
- p += sprintf( p, "<h1><center> 404 Ressource not found(%s)</center></h1>\n", query->psz_url );
+ p += sprintf( p, "<h1><center> 404 Resource not found(%s)</center></h1>\n", query->psz_url );
p += sprintf( p, "<hr />\n" );
p += sprintf( p, "<a href=\"http://www.videolan.org\">VideoLAN</a>\n" );
p += sprintf( p, "</body>\n" );
int fd;
fd = accept( host->fd, (struct sockaddr *)&sock, &i_sock_size );
- if( fd > 0 )
+ if( fd >= 0 )
{
- char *ip;
+ int i_state = 0;
+
+ /* set this new socket non-block */
+#if defined( WIN32 ) || defined( UNDER_CE )
+ {
+ unsigned long i_dummy = 1;
+ ioctlsocket( fd, FIONBIO, &i_dummy );
+ }
+#else
+ fcntl( fd, F_SETFL, O_NONBLOCK );
+#endif
- httpd_client_t *cl = httpd_ClientNew( fd, &sock, i_sock_size );
+ if( p_tls != NULL)
+ {
+ switch ( tls_ServerSessionHandshake( p_tls, fd ) )
+ {
+ case -1:
+ msg_Err( host, "Rejecting TLS connection" );
+ net_Close( fd );
+ fd = -1;
+ p_tls = NULL;
+ break;
- vlc_mutex_lock( &host->lock );
- TAB_APPEND( host->i_client, host->client, cl );
- vlc_mutex_unlock( &host->lock );
+ case 1: /* missing input - most likely */
+ i_state = HTTPD_CLIENT_TLS_HS_IN;
+ break;
- // FIXME: it sucks to allocate heap memory for a debug message
- ip = httpd_ClientIP( cl );
- msg_Dbg( host, "new connection (%s)",
- ip != NULL ? ip : "unknown" );
- free( ip );
+ case 2: /* missing output */
+ i_state = HTTPD_CLIENT_TLS_HS_OUT;
+ break;
+ }
+ }
+
+ if( fd >= 0 )
+ {
+ char *ip;
+ httpd_client_t *cl;
+
+ cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );
+ p_tls = NULL;
+ vlc_mutex_lock( &host->lock );
+ TAB_APPEND( host->i_client, host->client, cl );
+ vlc_mutex_unlock( &host->lock );
+
+ if( i_state != 0 )
+ cl->i_state = i_state; // override state for TLS
+
+ // FIXME: it sucks to allocate memory for debug
+ ip = httpd_ClientIP( cl );
+ msg_Dbg( host, "new connection (%s)",
+ ip != NULL ? ip : "unknown" );
+ if( ip != NULL)
+ free( ip );
+ }
}
}
/* now try all others socket */
{
httpd_ClientSend( cl );
}
+ else if( cl->i_state == HTTPD_CLIENT_TLS_HS_IN )
+ {
+ httpd_ClientTlsHsIn( cl );
+ }
+ else if( cl->i_state == HTTPD_CLIENT_TLS_HS_OUT )
+ {
+ httpd_ClientTlsHsOut( cl );
+ }
if( cl->i_mode == HTTPD_CLIENT_BIDIR &&
cl->i_state == HTTPD_CLIENT_SENDING &&
}
vlc_mutex_unlock( &host->lock );
}
+
+ if( p_tls != NULL )
+ tls_ServerSessionClose( p_tls );
}
#ifndef HAVE_GETADDRINFO
return ntohs( i_port );
}
+
+#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 0;
+}
+httpd_host_t *httpd_HostNew( vlc_object_t *a, char *b, int c )
+{
+ msg_Err( a, "HTTP daemon support is disabled" );
+ return 0;
+}
+void httpd_HostDelete( httpd_host_t *a ){}
+httpd_url_t *httpd_UrlNew( httpd_host_t *a, char *b ){ return 0; }
+httpd_url_t *httpd_UrlNewUnique( httpd_host_t *a, char *b, char *c,
+ char *d ){ return 0; }
+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 *a ){ return 0; }
+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 0; }
+
+void httpd_RedirectDelete( httpd_redirect_t *a ){}
+httpd_redirect_t *httpd_RedirectNew( httpd_host_t *a,
+ char *b, char *c ){ return 0; }
+
+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 0; }
+
+void httpd_MsgInit ( httpd_message_t *a ){}
+void httpd_MsgAdd ( httpd_message_t *a, char *b, char *c, ... ){}
+char *httpd_MsgGet ( httpd_message_t *a, char *b ){ return 0; }
+void httpd_MsgClean( httpd_message_t *a ){}
+
+#endif /* ENABLE_HTTPD */
projects / vlc / blobdiff