#include <vlc_tls.h>
#include <vlc_acl.h>
#include <vlc_strings.h>
+#include <vlc_rand.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
"<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)
{
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 )
{
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( 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 );
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 )
{
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 );
{
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 );
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 );
}
}
- url = malloc( sizeof( httpd_url_t ) );
+ url = xmalloc( sizeof( httpd_url_t ) );
url->host = host;
vlc_mutex_init( &url->lock );
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;
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 );
}
/* 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
{
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;
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 )
{
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 );
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
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;
}
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 ) )