X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_httpd.h;h=5103da5cf89db9f7606484fec56648cd4ccf2233;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=007506e2a563bb7ec3df400ec4786522693b0766;hpb=9ad4af7c881e8ebbc5d6127a48e54c9514b133df;p=vlc diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 007506e2a5..5103da5cf8 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,18 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _VLC_HTTPD_H -#define _VLC_HTTPD_H 1 +#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; -}; +/** + * \file + * This file defines functions, structures, enums and macros for httpd functionality in vlc. + */ enum { @@ -62,61 +57,24 @@ 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; - - /* Statistics */ - counter_t *p_active_counter; - counter_t *p_total_counter; - - 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, - HTTPD_PROTO_HTTP, - HTTPD_PROTO_RTSP, + HTTPD_PROTO_HTTP, /* HTTP/1.x */ + HTTPD_PROTO_RTSP, /* RTSP/1.x */ + HTTPD_PROTO_HTTP0, /* HTTP/0.x */ }; struct httpd_message_t { httpd_client_t *cl; /* NULL if not throught a connection e vlc internal */ - int i_type; - int i_proto; - int i_version; + uint8_t i_type; + uint8_t i_proto; + uint8_t i_version; /* for an answer */ int i_status; - char *psz_status; /* for a query */ char *psz_url; @@ -141,15 +99,15 @@ struct httpd_message_t }; /* create a new host */ -VLC_EXPORT( httpd_host_t *, httpd_HostNew, ( vlc_object_t *, const char *psz_host, int i_port ) ); -VLC_EXPORT( httpd_host_t *, httpd_TLSHostNew, ( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) ); +VLC_EXPORT( httpd_host_t *, httpd_HostNew, ( vlc_object_t *, const char *psz_host, int i_port ) LIBVLC_USED ); +VLC_EXPORT( httpd_host_t *, httpd_TLSHostNew, ( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) LIBVLC_USED ); /* delete a host */ VLC_EXPORT( void, httpd_HostDelete, ( httpd_host_t * ) ); /* register a new url */ -VLC_EXPORT( httpd_url_t *, httpd_UrlNew, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) ); -VLC_EXPORT( httpd_url_t *, httpd_UrlNewUnique, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) ); +VLC_EXPORT( httpd_url_t *, httpd_UrlNew, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED ); +VLC_EXPORT( httpd_url_t *, httpd_UrlNewUnique, ( httpd_host_t *, const char *psz_url, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED ); /* register callback on a url */ VLC_EXPORT( int, httpd_UrlCatch, ( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * ) ); /* delete an url */ @@ -163,29 +121,27 @@ VLC_EXPORT( char*, httpd_ServerIP, ( const httpd_client_t *cl, char *ps /* High level */ -VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, 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 * ) ); -VLC_EXPORT( void, httpd_FileDelete, ( httpd_file_t * ) ); +VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, 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 * ) LIBVLC_USED ); +VLC_EXPORT( httpd_file_sys_t *, httpd_FileDelete, ( httpd_file_t * ) ); -VLC_EXPORT( httpd_handler_t *, httpd_HandlerNew, ( httpd_host_t *, 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 * ) ); -VLC_EXPORT( void, httpd_HandlerDelete, ( httpd_handler_t * ) ); +VLC_EXPORT( httpd_handler_t *, httpd_HandlerNew, ( httpd_host_t *, 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 * ) LIBVLC_USED ); +VLC_EXPORT( httpd_handler_sys_t *, httpd_HandlerDelete, ( httpd_handler_t * ) ); -VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) ); +VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) LIBVLC_USED ); VLC_EXPORT( void, httpd_RedirectDelete, ( httpd_redirect_t * ) ); -VLC_EXPORT( httpd_stream_t *, httpd_StreamNew, ( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) ); +VLC_EXPORT( httpd_stream_t *, httpd_StreamNew, ( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, const vlc_acl_t *p_acl ) LIBVLC_USED ); VLC_EXPORT( void, httpd_StreamDelete, ( httpd_stream_t * ) ); VLC_EXPORT( int, httpd_StreamHeader, ( httpd_stream_t *, uint8_t *p_data, int i_data ) ); VLC_EXPORT( int, httpd_StreamSend, ( httpd_stream_t *, uint8_t *p_data, int i_data ) ); /* Msg functions facilities */ -VLC_EXPORT( void, httpd_MsgInit, ( httpd_message_t * ) ); -VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) ); +VLC_EXPORT( void, httpd_MsgAdd, ( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) LIBVLC_FORMAT( 3, 4 ) ); /* return "" if not found. The string is not allocated */ -VLC_EXPORT( const char *, httpd_MsgGet, ( httpd_message_t *, const char *psz_name ) ); -VLC_EXPORT( void, httpd_MsgClean, ( httpd_message_t * ) ); +VLC_EXPORT( const char *, httpd_MsgGet, ( const httpd_message_t *, const char *psz_name ) ); #endif /* _VLC_HTTPD_H */