X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_httpd.h;h=b2e212365311ab9eb5e9d10f60936c514a9d2028;hb=4d4eb33495d371286c1c2b76f2255cd38217fcf6;hp=ab3bb02c4fa5852852e42f3edaeeb612cfdde3f7;hpb=e611fdaed9c43584597eba1d1a7002cda5c9961a;p=vlc diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index ab3bb02c4f..b2e2123653 100644 --- a/include/vlc_httpd.h +++ b/include/vlc_httpd.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_httpd.h: builtin HTTP/RTSP server. ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2006 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -21,19 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_HTTPD_H #define _VLC_HTTPD_H 1 -/* NEVER touch that, it's here only because src/misc/objects.c - * need sizeof(httpd_t) */ -struct httpd_t -{ - VLC_COMMON_MEMBERS - - int i_host; - httpd_host_t **host; -}; - enum { HTTPD_MSG_NONE, @@ -62,39 +56,6 @@ enum HTTPD_MSG_MAX }; -/* each host run in his own thread */ -struct httpd_host_t -{ - VLC_COMMON_MEMBERS - - httpd_t *httpd; - - /* ref count */ - int i_ref; - - /* address/port and socket for listening at connections */ - char *psz_hostname; - int i_port; - int *fd; - - vlc_mutex_t lock; - - /* 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 - * All url will have their cb trigger, but only the first one can answer - * */ - int i_url; - httpd_url_t **url; - - int i_client; - httpd_client_t **client; - - /* TLS data */ - tls_server_t *p_tls; -}; - - - enum { HTTPD_PROTO_NONE, @@ -179,9 +140,9 @@ VLC_EXPORT( int, httpd_StreamSend, ( httpd_stream_t *, uint8_t *p /* Msg functions facilities */ VLC_EXPORT( void, httpd_MsgInit, ( httpd_message_t * ) ); -VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, char *psz_name, char *psz_value, ... ) ); +VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) ); /* return "" if not found. The string is not allocated */ -VLC_EXPORT( char *, httpd_MsgGet, ( httpd_message_t *, char *psz_name ) ); +VLC_EXPORT( const char *, httpd_MsgGet, ( httpd_message_t *, const char *psz_name ) ); VLC_EXPORT( void, httpd_MsgClean, ( httpd_message_t * ) ); #endif /* _VLC_HTTPD_H */