* include/httpd.h, modules/misc/httpd.c: remove old http daemon.

 * include/vlc_httpd.h src/misc/httpd.c: added new http daemon,
 it will allow http 1.1, redirection, RTSP, ...

include/httpd.h

-/*****************************************************************************
- * httpd.h
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.h,v 1.7 2003/07/11 09:50:10 gbazin Exp $
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-typedef struct httpd_host_t     httpd_host_t;
-
-typedef struct httpd_file_t     httpd_file_t;
-//typedef struct httpd_stream_t   httpd_stream_t;
-typedef httpd_file_t httpd_stream_t;
-
-typedef struct httpd_file_callback_args_t httpd_file_callback_args_t;
-typedef int (*httpd_file_callback)( httpd_file_callback_args_t *p_args,
-    uint8_t *p_request, int i_request, uint8_t **pp_data, int *pi_data );
-
-typedef struct httpd_sys_t httpd_sys_t;
-
-enum httpdControl_e
-{
-    HTTPD_GET_HOSTS,
-    HTTPD_GET_URLS,
-    HTTPD_GET_CONNECTIONS,
-    HTTPD_GET_ACL,          /* not implemented */
-
-    HTTPD_SET_CLOSE,
-    HTTPD_SET_ACL           /* not implemented */
-};
-
-typedef struct
-{
-    char *psz_name;
-    char *psz_value;
-} httpd_val_t;
-
-typedef struct
-{
-    int         i_count;
-    httpd_val_t *info;
-} httpd_info_t;
-
-
-typedef struct httpd_t httpd_t;
-
-struct httpd_t
-{
-    VLC_COMMON_MEMBERS
-
-    module_t        *p_module;
-    httpd_sys_t     *p_sys;
-
-    httpd_host_t   *(*pf_register_host)     ( httpd_t *, char *, int );
-    void            (*pf_unregister_host)   ( httpd_t *, httpd_host_t * );
-
-    httpd_file_t   *(*pf_register_file)     ( httpd_t *,
-                                              char *psz_file, char *psz_mime,
-                                              char *psz_user, char *psz_password,
-                                              httpd_file_callback pf_get,
-                                              httpd_file_callback pf_post,
-                                              httpd_file_callback_args_t *p_args );
-    void            (*pf_unregister_file)   ( httpd_t *, httpd_file_t * );
-
-    httpd_stream_t *(*pf_register_stream)   ( httpd_t *,
-                                              char *psz_file, char *psz_mime,
-                                              char *psz_user, char *psz_password );
-    int             (*pf_send_stream)       ( httpd_t *,
-                                              httpd_stream_t *,
-                                              uint8_t *, int );
-    int             (*pf_header_stream)     ( httpd_t *,
-                                              httpd_stream_t *,
-                                              uint8_t *, int );
-    void            (*pf_unregister_stream) ( httpd_t *, httpd_stream_t * );
-    int             (*pf_control)           ( httpd_t *,
-                                              int i_query,
-                                              void *arg1, void *arg2 );
-};
-
-
-/*****************************************************************************
- * httpd_Find:
- *  Return the running httpd instance (if none and b_create then a new one is created)
- * httpd_release:
- *****************************************************************************/
-
-static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
-{
-    httpd_t *p_httpd = NULL;
-    vlc_value_t lockval;
-
-    var_Get( p_this->p_libvlc, "httpd", &lockval );
-    vlc_mutex_lock( lockval.p_address );
-
-    p_httpd = vlc_object_find( p_this, VLC_OBJECT_HTTPD, FIND_ANYWHERE );
-    if( !p_httpd && b_create)
-    {
-        msg_Info(p_this, "creating new http daemon" );
-
-        p_httpd = vlc_object_create( p_this, VLC_OBJECT_HTTPD );
-        if( !p_httpd )
-        {
-            msg_Err( p_this, "out of memory" );
-            vlc_mutex_unlock( lockval.p_address );
-            return( NULL );
-        }
-
-        p_httpd->p_module = module_Need( p_httpd, "httpd", "" );
-
-        if( !p_httpd->p_module )
-        {
-            msg_Err( p_this, "no suitable httpd module" );
-            vlc_object_destroy( p_httpd );
-            vlc_mutex_unlock( lockval.p_address );
-            return( NULL );
-        }
-
-        vlc_object_yield( p_httpd );
-        vlc_object_attach( p_httpd, p_this->p_vlc );
-    }
-    vlc_mutex_unlock( lockval.p_address );
-
-    return( p_httpd );
-}
-
-static inline void  httpd_Release( httpd_t *p_httpd )
-{
-    vlc_object_release( p_httpd );
-
-    if( p_httpd->i_refcount <= 0 )
-    {
-        msg_Info( p_httpd, "destroying unused httpd" );
-        vlc_object_detach( p_httpd );
-        module_Unneed( p_httpd, p_httpd->p_module );
-        vlc_object_destroy( p_httpd );
-    }
-}

include/vlc_httpd.h

+/*****************************************************************************
+ * vlc_httpd.h: builtin HTTP/RTSP server.
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: vlc_httpd.h,v 1.1 2004/03/03 13:23:47 fenrir Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+#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,
+
+    /* answer */
+    HTTPD_MSG_ANSWER,
+
+    /* channel communication */
+    HTTPD_MSG_CHANNEL,
+
+    /* http request */
+    HTTPD_MSG_GET,
+    HTTPD_MSG_HEAD,
+    HTTPD_MSG_POST,
+
+    /* rtsp request */
+    HTTPD_MSG_OPTIONS,
+    HTTPD_MSG_DESCRIBE,
+    HTTPD_MSG_SETUP,
+    HTTPD_MSG_PLAY,
+    HTTPD_MSG_PAUSE,
+    HTTPD_MSG_TEARDOWN,
+
+    /* just to track the count of MSG */
+    HTTPD_MSG_MAX
+};
+
+enum
+{
+    HTTPD_PROTO_NONE,
+    HTTPD_PROTO_HTTP,
+    HTTPD_PROTO_RTSP,
+};
+
+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;
+
+    /* for an answer */
+    int     i_status;
+    char    *psz_status;
+
+    /* for a query */
+    char    *psz_url;
+    char    *psz_args;  /* FIXME find a clean way to handle GET(psz_args) and POST(body) through the same code */
+
+    /* for rtp over rtsp */
+    int     i_channel;
+
+    /* options */
+    int     i_name;
+    char    **name;
+    int     i_value;
+    char    **value;
+
+    /* body */
+    int64_t i_body_offset;
+    int     i_body;
+    uint8_t *p_body;
+
+};
+
+/* 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 *, char *psz_host, int i_port ) );
+/* 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 *, char *psz_url, char *psz_user, char *psz_password ) );
+VLC_EXPORT( httpd_url_t *,  httpd_UrlNewUnique, ( httpd_host_t *, char *psz_url, char *psz_user, char *psz_password ) );
+/* 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 * ) );
+
+/* 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 ) );
+
+/* High level */
+
+VLC_EXPORT( httpd_file_t *, httpd_FileNew, ( httpd_host_t *, char *psz_url, char *psz_mime, char *psz_user, char *psz_password, httpd_file_callback_t pf_fill, httpd_file_sys_t * ) );
+VLC_EXPORT( void,           httpd_FileDelete, ( httpd_file_t * ) );
+
+
+VLC_EXPORT( httpd_redirect_t *, httpd_RedirectNew, ( httpd_host_t *, char *psz_url_dst, char *psz_url_src ) );
+VLC_EXPORT( void,               httpd_RedirectDelete, ( httpd_redirect_t * ) );
+
+
+VLC_EXPORT( httpd_stream_t *, httpd_StreamNew,    ( httpd_host_t *, char *psz_url, char *psz_mime, char *psz_user, char *psz_password ) );
+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 *, char *psz_name, 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( void,         httpd_MsgClean, ( httpd_message_t * ) );
+
+#endif /* _VLC_HTTPD_H */