X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnetwork%2Fhttpd.c;h=cad49ed8012ba028baff6da0568e369ed2e56d12;hb=e7ee6a9d861ea4f62a828ebd929f8ecd15b4163f;hp=06bd9dc4b088908051a9f19948281fdcfc36c9f7;hpb=7060dbb9a2337bbe05e2be96a22a5282c722d2a7;p=vlc diff --git a/src/network/httpd.c b/src/network/httpd.c index 06bd9dc4b0..cad49ed801 100644 --- a/src/network/httpd.c +++ b/src/network/httpd.c @@ -30,8 +30,6 @@ #include #include -#ifdef ENABLE_HTTPD - #include #include @@ -47,10 +45,6 @@ # include #endif -#ifdef HAVE_FCNTL_H -# include -#endif - #ifdef HAVE_POLL # include #endif @@ -89,7 +83,7 @@ struct httpd_host_t httpd_t *httpd; /* ref count */ - int i_ref; + unsigned i_ref; /* address/port and socket for listening at connections */ char *psz_hostname; @@ -97,7 +91,9 @@ struct httpd_host_t int *fds; unsigned nfd; + 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 @@ -227,8 +223,12 @@ static const struct { ".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" }, @@ -362,7 +362,7 @@ static size_t httpd_HtmlError (char **body, int code, const char *url) "VideoLAN\n" "\n" "\n", errname, code, errname, - (url ? " (" : ""), (url ?: ""), (url ? ")" : "")); + (url ? " (" : ""), (url ? url : ""), (url ? ")" : "")); if (res == -1) { @@ -456,7 +456,7 @@ httpd_file_t *httpd_FileNew( httpd_host_t *host, 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 ) @@ -559,7 +559,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, { 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 ); } } @@ -573,8 +573,8 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, { /* 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 @@ -587,7 +587,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, 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 ); @@ -604,7 +604,7 @@ httpd_handler_t *httpd_HandlerNew( httpd_host_t *host, const char *psz_url, 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 ) @@ -675,7 +675,7 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys, 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 ) ) ) { @@ -781,7 +781,7 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, 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; @@ -804,7 +804,7 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, 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; @@ -857,7 +857,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, 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 ) @@ -878,7 +878,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, 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; @@ -903,7 +903,7 @@ int httpd_StreamHeader( httpd_stream_t *stream, uint8_t *p_data, int i_data ) 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 ); @@ -960,7 +960,7 @@ void httpd_StreamDelete( httpd_stream_t *stream ) /***************************************************************************** * Low level *****************************************************************************/ -static void* httpd_HostThread( vlc_object_t * ); +static void* httpd_HostThread( void * ); /* create a new host */ httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host, @@ -971,6 +971,7 @@ httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host, } static const char psz_object_type[] = "http server"; +static vlc_mutex_t httpd_mutex = VLC_STATIC_MUTEX; httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, int i_port, @@ -981,7 +982,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, httpd_host_t *host; tls_server_t *p_tls; char *psz_host; - vlc_value_t lockval, ptrval; + vlc_value_t ptrval; int i; if( psz_hostname == NULL ) @@ -992,9 +993,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, return NULL; /* 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 ); + vlc_mutex_lock( &httpd_mutex ); httpd = libvlc_priv (p_this->p_libvlc)->p_httpd; if( httpd == NULL ) @@ -1005,7 +1004,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, psz_object_type ); if( httpd == NULL ) { - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); free( psz_host ); return NULL; } @@ -1015,7 +1014,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, ptrval.p_address = httpd; libvlc_priv (p_this->p_libvlc)->p_httpd = httpd; - vlc_object_hold( httpd ); vlc_object_attach( httpd, p_this->p_libvlc ); } @@ -1030,10 +1028,15 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, || strcmp( host->psz_hostname, psz_hostname ) ) 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 ); return host; } @@ -1071,17 +1074,9 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, 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 ); @@ -1092,6 +1087,12 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, } for (host->nfd = 0; host->fds[host->nfd] != -1; host->nfd++); + if( vlc_object_waitpipe( VLC_OBJECT( host ) ) == -1 ) + { + msg_Err( host, "signaling pipe error: %m" ); + goto error; + } + host->i_port = i_port; host->psz_hostname = psz_host; @@ -1103,8 +1104,8 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, 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; @@ -1112,7 +1113,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, /* now add it to httpd */ TAB_APPEND( httpd->i_host, httpd->host, host ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); return host; @@ -1120,15 +1121,16 @@ error: free( psz_host ); if( httpd->i_host <= 0 ) { - vlc_object_release( 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 ); if( host != NULL ) { net_ListenClose( host->fds ); + vlc_cond_destroy( &host->wait ); vlc_mutex_destroy( &host->lock ); vlc_object_release( host ); } @@ -1143,24 +1145,30 @@ error: 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 ); vlc_object_kill( host ); - vlc_thread_join( host ); + vlc_join( host->thread, NULL ); msg_Dbg( host, "HTTP host removed" ); @@ -1185,20 +1193,19 @@ void httpd_HostDelete( httpd_host_t *host ) 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 ) { - msg_Dbg( httpd, "no host left, stopping httpd" ); + 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( lockval.p_address ); + vlc_mutex_unlock( &httpd_mutex ); } /* register a new url */ @@ -1226,7 +1233,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url } } - url = malloc( sizeof( httpd_url_t ) ); + url = xmalloc( sizeof( httpd_url_t ) ); url->host = host; vlc_mutex_init( &url->lock ); @@ -1241,6 +1248,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url } TAB_APPEND( host->i_url, host->url, url ); + vlc_cond_signal( &host->wait ); vlc_mutex_unlock( &host->lock ); return url; @@ -1307,7 +1315,7 @@ void httpd_UrlDelete( httpd_url_t *url ) 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; @@ -1331,7 +1339,7 @@ void httpd_MsgInit( httpd_message_t *msg ) msg->p_body = NULL; } -void httpd_MsgClean( httpd_message_t *msg ) +static void httpd_MsgClean( httpd_message_t *msg ) { int i; @@ -1393,7 +1401,7 @@ static void httpd_ClientInit( httpd_client_t *cl, mtime_t now ) 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; @@ -1541,7 +1549,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) 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 ); } @@ -1744,12 +1752,16 @@ static void httpd_ClientRecv( httpd_client_t *cl ) { *p2++ = '\0'; } - if( !strncasecmp( p, "rtsp:", 5 ) ) - { - /* for rtsp url, you have rtsp://localhost:port/path */ - p += 5; - while( *p == '/' ) p++; - while( *p && *p != '/' ) p++; + if( !strncasecmp( p, ( cl->query.i_proto + == HTTPD_PROTO_HTTP ) ? "http" : "rtsp", 4 ) + && p[4 + !!strchr( "sS", p[4] )] == ':' ) + { /* Skip hier-part of URL (if present) */ + p = strchr( p, ':' ) + 1; /* skip URI scheme */ + if( !strncmp( p, "//", 2 ) ) /* skip authority */ + { /* see RFC3986 §3.2 */ + p += 2; + while( *p && !strchr( "/?#", *p ) ) p++; + } } cl->query.psz_url = strdup( p ); if( ( p3 = strchr( cl->query.psz_url, '?' ) ) ) @@ -1818,7 +1830,7 @@ static void httpd_ClientRecv( httpd_client_t *cl ) /* 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 @@ -1906,7 +1918,7 @@ static void httpd_ClientSend( httpd_client_t *cl ) { 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; @@ -2019,31 +2031,16 @@ static void httpd_ClientTlsHsOut( httpd_client_t *cl ) } } -static void* httpd_HostThread( vlc_object_t *p_this ) +static void* httpd_HostThread( void *data ) { - httpd_host_t *host = (httpd_host_t *)p_this; + httpd_host_t *host = data; 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; - bool b_die; - int canc = vlc_savecancel (); - -retry: - vlc_object_lock( host ); - evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); - b_die = !vlc_object_alive( host ); - vlc_object_unlock( host ); + int evfd = vlc_object_waitpipe( VLC_OBJECT( host ) ); - while( !b_die ) + for( ;; ) { - if( host->i_url <= 0 ) - { - /* 0.2s (FIXME: use a condition variable) */ - msleep( 200000 ); - goto retry; - } - /* prepare a new TLS session */ if( ( p_tls == NULL ) && ( host->p_tls != NULL ) ) p_tls = tls_ServerSessionPrepare( host->p_tls ); @@ -2059,6 +2056,9 @@ retry: /* 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; @@ -2261,8 +2261,7 @@ retry: { 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 ); @@ -2351,8 +2350,8 @@ retry: } 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 ) ) { @@ -2362,7 +2361,7 @@ retry: 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 @@ -2380,7 +2379,7 @@ retry: 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; } @@ -2453,27 +2452,23 @@ retry: continue; } - vlc_object_lock( host ); if( ufd[nfd - 1].revents ) - { - b_die = !vlc_object_alive( host ); - if( !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 @@ -2518,6 +2513,10 @@ retry: continue; /* */ +#ifdef HAVE_ACCEPT4 + fd = accept4 (fd, NULL, NULL, SOCK_CLOEXEC); + if (fd == -1 && errno == ENOSYS) +#endif fd = accept (fd, NULL, NULL); if (fd == -1) continue; @@ -2569,151 +2568,5 @@ retry: stats_CounterClean( p_total_counter ); if( p_active_counter ) stats_CounterClean( p_active_counter ); - vlc_restorecancel (canc); - return NULL; -} - -#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 */