Changeset 5d10806a802531229498178360ca122984f3857c

Show
Ignore:
Timestamp:
01/12/06 19:54:34 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1164999274 +0000
git-parent:

[bc73810b6215db6710cb6ee39a01422b5535a8ba]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1164999274 +0000
Message:

Hide some httpd structures from modules

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_httpd.h

    rd3fe7f2 r5d10806  
    22 * vlc_httpd.h: builtin HTTP/RTSP server. 
    33 ***************************************************************************** 
    4  * Copyright (C) 2004 the VideoLAN team 
     4 * Copyright (C) 2004-2006 the VideoLAN team 
    55 * $Id$ 
    66 * 
    …… 
    2424#ifndef _VLC_HTTPD_H 
    2525#define _VLC_HTTPD_H 1 
    26  
    27 /* NEVER touch that, it's here only because src/misc/objects.c 
    28  * need sizeof(httpd_t) */ 
    29 struct httpd_t 
    30 { 
    31     VLC_COMMON_MEMBERS 
    32  
    33     int          i_host; 
    34     httpd_host_t **host; 
    35 }; 
    3626 
    3727enum 
    …… 
    6252    HTTPD_MSG_MAX 
    6353}; 
    64  
    65 /* each host run in his own thread */ 
    66 struct httpd_host_t 
    67 { 
    68     VLC_COMMON_MEMBERS 
    69  
    70     httpd_t     *httpd; 
    71  
    72     /* ref count */ 
    73     int         i_ref; 
    74  
    75     /* address/port and socket for listening at connections */ 
    76     char        *psz_hostname; 
    77     int         i_port; 
    78     int         *fd; 
    79  
    80     /* Statistics */ 
    81     counter_t *p_active_counter; 
    82     counter_t *p_total_counter; 
    83  
    84     vlc_mutex_t lock; 
    85  
    86     /* all registered url (becarefull that 2 httpd_url_t could point at the same url) 
    87      * This will slow down the url research but make my live easier 
    88      * All url will have their cb trigger, but only the first one can answer 
    89      * */ 
    90     int         i_url; 
    91     httpd_url_t **url; 
    92  
    93     int            i_client; 
    94     httpd_client_t **client; 
    95  
    96     /* TLS data */ 
    97     tls_server_t *p_tls; 
    98 }; 
    99  
    10054 
    10155enum 

  • src/misc/objects.c

    rd3fe7f2 r5d10806  
    5454 
    5555#include "vlc_httpd.h" 
     56#include "../network/httpd.h" 
    5657#include "vlc_vlm.h" 
    5758#include "vlc_vod.h" 

  • src/network/httpd.c

    rbc73810 r5d10806  
    3636#include <vlc_tls.h> 
    3737#include <vlc_acl.h> 
     38#include "httpd.h" 
    3839 
    3940#include <string.h>