X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fhttpd.h;h=6d04a8dc7a6f48d0719d51cae77aaa4bf498591c;hb=43cf73c3bcdecfc1c5c43b284f6a7726b69989e8;hp=99d56cf9ba082e58a4fb2377d8ac2451a8ac46a3;hpb=49947b1437e427a75d112957ed788ba4f9e8544b;p=vlc

diff --git a/include/httpd.h b/include/httpd.h
index 99d56cf9ba..6d04a8dc7a 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2,7 +2,7 @@
  * httpd.h
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.h,v 1.3 2003/03/06 11:09:56 fenrir Exp $
+ * $Id: httpd.h,v 1.7 2003/07/11 09:50:10 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -21,8 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-typedef struct httpd_t          httpd_t;
-
 typedef struct httpd_host_t     httpd_host_t;
 
 typedef struct httpd_file_t     httpd_file_t;
@@ -30,10 +28,37 @@ typedef struct httpd_file_t     httpd_file_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 **pp_data, int *pi_data );
+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
@@ -47,7 +72,8 @@ struct httpd_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_fill,
+                                              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 * );
 
@@ -61,31 +87,36 @@ struct 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)
- */
+ *  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 )
+    if( !p_httpd && b_create)
     {
         msg_Info(p_this, "creating new http daemon" );
-        if( !b_create )
-        {
-            return( NULL );
-        }
 
         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 );
         }
 
@@ -95,12 +126,14 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
         {
             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 );
 }
@@ -108,11 +141,12 @@ static inline httpd_t* httpd_Find( vlc_object_t *p_this, vlc_bool_t b_create )
 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 );
     }
 }
-
-
-