Changeset 2fac2b1d070cdb9dd9f6ba5fa4977c148cf12600

Timestamp:

01/12/06 21:26:05 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1165004765 +0000

git-parent:

[17853c532cf3f3aebd4eb454b7d5f50dde889f03]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1165004765 +0000

Message:

Hide httpd_t and httpd_host_t within httpd.c

Files:

• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (4 diffs)
• src/network/httpd.c (modified) (5 diffs)
• src/network/httpd.h (deleted)

src/libvlc.h

@@ -33 +33 @@
-extern const size_t libvlc_hotkeys_size;
-
+extern vlc_object_t *
+vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
+                   const char *psz_type);
+
-#endif

src/misc/objects.c

@@ -37 +37 @@
-#endif
-
+#include "../libvlc.h"
-#include <vlc_vout.h>
-#include <vlc_aout.h>
@@ -54 +55 @@
-
-#include "vlc_httpd.h"
-#include "../network/httpd.h"
-#include "vlc_vlm.h"
-#include "vlc_vod.h"
@@ -88 +88 @@
-static vlc_mutex_t    structure_lock;
-
-static 
+
-                                 int i_type, const char *psz_type )
-{
@@ -286 +286 @@
-            psz_type = "stream output";
-            break;
-        case VLC_OBJECT_HTTPD:
-            i_size = sizeof( httpd_t );
-            psz_type = "http server";
-            break;
-        case VLC_OBJECT_HTTPD_HOST:
-            i_size = sizeof( httpd_host_t );
-            psz_type = "http server";
-            break;
-        case VLC_OBJECT_VLM:
-            i_size = sizeof( vlm_t );

src/network/httpd.c

@@ -36 +36 @@
-#include <vlc_tls.h>
-#include <vlc_acl.h>
-httpd
+../libvlc
-
-#include <string.h>
@@ -65 +65 @@
-
-static void httpd_ClientClean( httpd_client_t *cl );
+
+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;
+};
+
-
-struct httpd_url_t
@@ -982 +1027 @@
-}
-
+static const char psz_object_type[] = "http server";
+
-httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
-                                int i_port,
@@ -1012 +1059 @@
-    {
-        msg_Info( p_this, "creating httpd" );
-
+
+
+
+
-        {
-            vlc_mutex_unlock( lockval.p_address );
@@ -1072 +1122 @@
-
-    /* create the new host */
-
+
+
+
+
+
+
-    host->httpd = httpd;
-    vlc_mutex_init( httpd, &host->lock );