decoder: add input_DecoderFlush()

[vlc] / include / vlc_tls.h

diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index d732d16d1703f4fb9b590527a464266bc37d9836..8b55ee833d760b803f2dfd560158d2a1f2451c12 100644 (file)
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -30,27 +30,26 @@
 # include <vlc_network.h>
 
 typedef struct vlc_tls vlc_tls_t;
-typedef struct vlc_tls_sys vlc_tls_sys_t;
 typedef struct vlc_tls_creds vlc_tls_creds_t;
-typedef struct vlc_tls_creds_sys vlc_tls_creds_sys_t;
 
 /** TLS session */
 struct vlc_tls
 {
     VLC_COMMON_MEMBERS
 
-    vlc_tls_sys_t *sys;
+    void *sys;
 
     struct virtual_socket_t sock;
-    int  (*handshake) (struct vlc_tls *);
 };
 
 VLC_API vlc_tls_t *vlc_tls_ClientSessionCreate (vlc_tls_creds_t *, int fd,
-                                                const char *host);
-vlc_tls_t *vlc_tls_ServerSessionCreate (vlc_tls_creds_t *, int fd);
-int vlc_tls_ServerSessionHandshake (vlc_tls_t *);
+                                         const char *host, const char *service,
+                                         const char *const *alpn, char **alp);
+vlc_tls_t *vlc_tls_SessionCreate (vlc_tls_creds_t *, int fd, const char *host,
+                                  const char *const *alpn);
+int vlc_tls_SessionHandshake (vlc_tls_t *, const char *host, const char *serv,
+                              char ** /*restrict*/ alp);
 VLC_API void vlc_tls_SessionDelete (vlc_tls_t *);
-#define vlc_tls_ServerSessionDelete vlc_tls_SessionDelete
 
 /* NOTE: It is assumed that a->sock.p_sys = a */
 # define tls_Send( a, b, c ) (((vlc_tls_t *)a)->sock.pf_send (a, b, c))
@@ -64,21 +63,18 @@ struct vlc_tls_creds
     VLC_COMMON_MEMBERS
 
     module_t  *module;
-    vlc_tls_creds_sys_t *sys;
+    void *sys;
 
-    int (*add_CA) (vlc_tls_creds_t *, const char *path);
-    int (*add_CRL) (vlc_tls_creds_t *, const char *path);
-
-    int (*open) (vlc_tls_creds_t *, vlc_tls_t *, int fd, const char *host);
-    void (*close) (vlc_tls_creds_t *, vlc_tls_t *);
+    int (*open) (vlc_tls_creds_t *, vlc_tls_t *, int fd, const char *host,
+                 const char *const *alpn);
+    int  (*handshake) (vlc_tls_t *, const char *host, const char *service,
+                       char ** /*restrict*/ alp);
+    void (*close) (vlc_tls_t *);
 };
 
 VLC_API vlc_tls_creds_t *vlc_tls_ClientCreate (vlc_object_t *);
 vlc_tls_creds_t *vlc_tls_ServerCreate (vlc_object_t *,
                                        const char *cert, const char *key);
 VLC_API void vlc_tls_Delete (vlc_tls_creds_t *);
-#define vlc_tls_ServerDelete vlc_tls_Delete
-int vlc_tls_ServerAddCA (vlc_tls_creds_t *srv, const char *path);
-int vlc_tls_ServerAddCRL (vlc_tls_creds_t *srv, const char *path);
 
 #endif