ffmpeg.patch.cvs: oops, fix build

[vlc] / include / vlc_tls.h

diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index 01e56336aef2e383fd2cf17462c9ab5f2a7e3192..b9ef4afb88cfcf7af4c80b1de00d404813c8bab7 100644 (file)
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * tls.c
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: httpd.c 8263 2004-07-24 09:06:58Z courmisch $
+ * Copyright (C) 2004-2005 the VideoLAN team
+ * $Id$
  *
- * Authors: Remi Denis-Courmont <courmisch@via.ecp.fr>
+ * Authors: Remi Denis-Courmont <rem # videolan.org>
  *
  * 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
@@ -21,6 +21,50 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifndef _VLC_TLS_H
+# define _VLC_TLS_H
+
+# include "network.h"
+
+struct tls_t
+{
+    VLC_COMMON_MEMBERS
+
+    /* Module properties */
+    module_t  *p_module;
+    void *p_sys;
+
+    tls_server_t * (*pf_server_create) ( tls_t *, const char *,
+                                         const char * );
+    tls_session_t * (*pf_client_create) ( tls_t * );
+};
+
+struct tls_server_t
+{
+    VLC_COMMON_MEMBERS
+
+    void *p_sys;
+
+    void (*pf_delete) ( tls_server_t * );
+    
+    int (*pf_add_CA) ( tls_server_t *, const char * );
+    int (*pf_add_CRL) ( tls_server_t *, const char * );
+    
+    tls_session_t * (*pf_session_prepare) ( tls_server_t * );
+};
+
+struct tls_session_t
+{
+    VLC_COMMON_MEMBERS
+
+    void *p_sys;
+
+    struct virtual_socket_t sock;
+    int (*pf_handshake) ( tls_session_t *, int, const char * );
+    int (*pf_handshake2) ( tls_session_t * );
+    void (*pf_close) ( tls_session_t * );
+};
+
 
 /*****************************************************************************
  * tls_ServerCreate:
@@ -30,14 +74,13 @@
  *****************************************************************************/
 VLC_EXPORT( tls_server_t *, tls_ServerCreate, ( vlc_object_t *, const char *, const char * ) );
 
-
 /*****************************************************************************
  * tls_ServerAddCA:
  *****************************************************************************
  * Adds one or more certificate authorities.
  * Returns -1 on error, 0 on success.
  *****************************************************************************/
-VLC_EXPORT( int, tls_ServerAddCA, ( tls_server_t *, const char * ) );
+# define tls_ServerAddCA( a, b ) (((tls_server_t *)a)->pf_add_CA (a, b))
 
 
 /*****************************************************************************
@@ -46,23 +89,27 @@ VLC_EXPORT( int, tls_ServerAddCA, ( tls_server_t *, const char * ) );
  * Adds a certificates revocation list to be sent to TLS clients.
  * Returns -1 on error, 0 on success.
  *****************************************************************************/
-VLC_EXPORT( int, tls_ServerAddCRL, ( tls_server_t *, const char * ) );
+# define tls_ServerAddCRL( a, b ) (((tls_server_t *)a)->pf_add_CRL (a, b))
 
 
 VLC_EXPORT( void, tls_ServerDelete, ( tls_server_t * ) );
 
 
-tls_session_t *
-tls_ServerSessionPrepare( const tls_server_t *p_server );
+# define tls_ServerSessionPrepare( a ) (((tls_server_t *)a)->pf_session_prepare (a))
+# define tls_ServerSessionHandshake( a, b ) (((tls_session_t *)a)->pf_handshake (a, b, NULL))
+# define tls_ServerSessionClose( a ) (((tls_session_t *)a)->pf_close (a))
+
+VLC_EXPORT( tls_session_t *, tls_ClientCreate, ( vlc_object_t *, int, const char * ) );
+VLC_EXPORT( void, tls_ClientDelete, ( tls_session_t * ) );
+
+# define tls_ClientSessionHandshake( a, b, c ) (((tls_session_t *)a)->pf_handshake (a, b, c))
+
+# define tls_SessionContinueHandshake( a ) (((tls_session_t *)a)->pf_handshake2 (a))
 
-tls_session_t *
-tls_SessionHandshake( tls_session_t *p_session, int fd );
 
-void
-tls_SessionClose( tls_session_t *p_session );
+/* NOTE: It is assumed that a->sock.p_sys = a */
+# define tls_Send( a, b, c ) (((tls_session_t *)a)->sock.pf_send (a, b, c ))
 
-int
-tls_Send( tls_session_t *p_session, const char *buf, int i_length );
+# define tls_Recv( a, b, c ) (((tls_session_t *)a)->sock.pf_recv (a, b, c ))
 
-int
-tls_Recv( tls_session_t *p_session, char *buf, int i_length );
+#endif