Hide some httpd structures from modules

diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h
index dab5a48fb0299ec670c138cc37477d7dc5355124..708882988add1e6822d09510b7ead0c221ca91a2 100644 (file)
--- 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 <fenrir@via.ecp.fr>
@@ -24,16 +24,6 @@
 #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,42 +52,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;
-
-    /* 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,

diff --git a/src/misc/objects.c b/src/misc/objects.c
index c2f76f5fe3e250165e39585e88701897454895da..22b8c7470f50b855a32f24efee506c47356d49d1 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -53,6 +53,7 @@
 #include "vlc_filter.h"
 
 #include "vlc_httpd.h"
+#include "../network/httpd.h"
 #include "vlc_vlm.h"
 #include "vlc_vod.h"
 #include "vlc_tls.h"

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 58a8f096831dfdc76822ef54ee48da22513642a9..93521835a27e1da91669d32d9ecca484b5adf9c2 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -35,6 +35,7 @@
 #include <vlc_network.h>
 #include <vlc_tls.h>
 #include <vlc_acl.h>
+#include "httpd.h"
 
 #include <string.h>
 #include <errno.h>

diff --git a/src/network/httpd.h b/src/network/httpd.h
new file mode 100644 (file)
index 0000000..e83c17d
--- /dev/null
+++ b/src/network/httpd.h
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * httpd.h: builtin HTTP/RTSP server internals.
+ *****************************************************************************
+ * Copyright (C) 2004-2006 the VideoLAN team
+ * $Id$
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef _LIBVLC_HTTPD_H
+#define _LIBVLC_HTTPD_H 1
+
+struct httpd_t
+{
+    VLC_COMMON_MEMBERS
+
+    int          i_host;
+    httpd_host_t **host;
+};
+
+
+/* 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;
+};
+#endif /* _LIBVLC_HTTPD_H */