X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_httpd.h;h=6e3c6f1995c443f083ad3fe8792151af40b9711f;hb=cc7e7e49d6d437770ced60e2620efdee95495fb6;hp=897cf91d88683cc5394ad51e542a992eea7842b8;hpb=aed69fef6220413ac7cd26d36d294ba4c9156015;p=vlc diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 897cf91d88..6e3c6f1995 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 @@ -18,21 +18,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 { @@ -55,6 +50,7 @@ enum HTTPD_MSG_SETUP, HTTPD_MSG_PLAY, HTTPD_MSG_PAUSE, + HTTPD_MSG_GETPARAMETER, HTTPD_MSG_TEARDOWN, /* just to track the count of MSG */ @@ -64,21 +60,21 @@ enum 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; @@ -102,59 +98,50 @@ struct httpd_message_t }; -/* I keep the definition here, easier than looking at vlc_common.h - - * answer could be null, int this case no answer is requested -typedef int (*httpd_callback_t)( httpd_callback_sys_t *, httpd_client_t *, httpd_message_t *answer, httpd_message_t *query ); -typedef struct httpd_callback_sys_t httpd_callback_sys_t; - -typedef struct httpd_file_t httpd_file_t; -typedef struct httpd_file_sys_t httpd_file_sys_t; -typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t *psz_request, uint8_t **pp_data, int *pi_data ); -*/ - /* 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_API httpd_host_t * httpd_HostNew( vlc_object_t *, const char *psz_host, int i_port ) VLC_USED; +VLC_API httpd_host_t * httpd_TLSHostNew( vlc_object_t *, const char *, int, const char *, const char *, const char *, const char * ) VLC_USED; /* delete a host */ -VLC_EXPORT( void, httpd_HostDelete, ( httpd_host_t * ) ); +VLC_API 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_API 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_USED; +VLC_API 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_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 */ -VLC_EXPORT( void, httpd_UrlDelete, ( httpd_url_t * ) ); +VLC_API int httpd_UrlCatch( httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t * ); +/* delete a url */ +VLC_API void httpd_UrlDelete( httpd_url_t * ); /* Default client mode is FILE, use these to change it */ -VLC_EXPORT( void, httpd_ClientModeStream, ( httpd_client_t *cl ) ); -VLC_EXPORT( void, httpd_ClientModeBidir, ( httpd_client_t *cl ) ); -VLC_EXPORT( char*, httpd_ClientIP, ( httpd_client_t *cl, char *psz_ip ) ); -VLC_EXPORT( char*, httpd_ServerIP, ( httpd_client_t *cl, char *psz_ip ) ); +VLC_API void httpd_ClientModeStream( httpd_client_t *cl ); +VLC_API void httpd_ClientModeBidir( httpd_client_t *cl ); +VLC_API char* httpd_ClientIP( const httpd_client_t *cl, char *psz_ip ); +VLC_API char* httpd_ServerIP( const httpd_client_t *cl, char *psz_ip ); /* 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_API 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_USED; +VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * ); + + +VLC_API 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_USED; +VLC_API 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( void, httpd_RedirectDelete, ( httpd_redirect_t * ) ); +VLC_API httpd_redirect_t * httpd_RedirectNew( httpd_host_t *, const char *psz_url_dst, const char *psz_url_src ) VLC_USED; +VLC_API 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( 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 ) ); +VLC_API 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_USED; +VLC_API void httpd_StreamDelete( httpd_stream_t * ); +VLC_API int httpd_StreamHeader( httpd_stream_t *, uint8_t *p_data, int i_data ); +VLC_API 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 *, char *psz_name, char *psz_value, ... ) ); +VLC_API void httpd_MsgAdd( httpd_message_t *, const char *psz_name, const char *psz_value, ... ) VLC_FORMAT( 3, 4 ); /* return "" if not found. The string is not allocated */ -VLC_EXPORT( char *, httpd_MsgGet, ( httpd_message_t *, char *psz_name ) ); -VLC_EXPORT( void, httpd_MsgClean, ( httpd_message_t * ) ); +VLC_API const char * httpd_MsgGet( const httpd_message_t *, const char *psz_name ); #endif /* _VLC_HTTPD_H */