TLS: attach before inheriting variables

[vlc] / src / network / tls.c

diff --git a/src/network/tls.c b/src/network/tls.c
index 756e2264c3d67f0b74c3e03486d946c865e66864..1b11bde0387a50062d613be692d5a981461c9ac7 100644 (file)
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -26,7 +26,11 @@
  * libvlc interface to the Transport Layer Security (TLS) plugins.
  */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include <vlc_tls.h>
@@ -65,15 +69,15 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
         var_SetString (srv, "tls-x509-key", key_path);
     }
 
-    srv->p_module = module_Need (srv, "tls server", 0, 0);
+    vlc_object_attach (srv, obj);
+    srv->p_module = module_need (srv, "tls server", NULL, false );
     if (srv->p_module == NULL)
     {
         msg_Err (srv, "TLS server plugin not available");
-        vlc_object_destroy (srv);
+        vlc_object_release (srv);
         return NULL;
     }
 
-    vlc_object_attach (srv, obj);
     msg_Dbg (srv, "TLS server plugin initialized");
     return srv;
 }
@@ -88,9 +92,64 @@ void tls_ServerDelete (tls_server_t *srv)
     if (srv == NULL)
         return;
 
-    module_Unneed (srv, srv->p_module);
-    vlc_object_detach (srv);
-    vlc_object_destroy (srv);
+    module_unneed (srv, srv->p_module);
+    vlc_object_release (srv);
+}
+
+
+/**
+ * Adds one or more certificate authorities from a file.
+ * @return -1 on error, 0 on success.
+ */
+int tls_ServerAddCA (tls_server_t *srv, const char *path)
+{
+    return srv->pf_add_CA (srv, path);
+}
+
+
+/**
+ * Adds one or more certificate revocation list from a file.
+ * @return -1 on error, 0 on success.
+ */
+int tls_ServerAddCRL (tls_server_t *srv, const char *path)
+{
+    return srv->pf_add_CRL (srv, path);
+}
+
+
+tls_session_t *tls_ServerSessionPrepare (tls_server_t *srv)
+{
+    tls_session_t *ses;
+
+    ses = srv->pf_open (srv);
+    if (ses == NULL)
+        return NULL;
+
+    vlc_object_attach (ses, srv);
+    return ses;
+}
+
+
+void tls_ServerSessionClose (tls_session_t *ses)
+{
+    tls_server_t *srv = (tls_server_t *)(ses->p_parent);
+    srv->pf_close (srv, ses);
+}
+
+
+int tls_ServerSessionHandshake (tls_session_t *ses, int fd)
+{
+    ses->pf_set_fd (ses, fd);
+    return 2;
+}
+
+
+int tls_SessionContinueHandshake (tls_session_t *ses)
+{
+    int val = ses->pf_handshake (ses);
+    if (val < 0)
+        tls_ServerSessionClose (ses);
+    return val;
 }
 
 
@@ -108,6 +167,7 @@ tls_session_t *
 tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
 {
     tls_session_t *cl;
+    int val;
 
     cl = (tls_session_t *)vlc_custom_create (obj, sizeof (*cl),
                                              VLC_OBJECT_GENERIC,
@@ -124,28 +184,30 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
     else
         msg_Dbg (cl, "requested anonymous server");
 
-    cl->p_module = module_Need (cl, "tls client", 0, 0);
+    vlc_object_attach (cl, obj);
+    cl->p_module = module_need (cl, "tls client", NULL, false );
     if (cl->p_module == NULL)
     {
         msg_Err (cl, "TLS client plugin not available");
-        vlc_object_destroy (cl);
+        vlc_object_release (cl);
         return NULL;
     }
 
-    int val = tls_ClientSessionHandshake (cl, fd);
-    while (val > 0)
-        val = tls_SessionContinueHandshake (cl);
+    cl->pf_set_fd (cl, fd);
+
+    do
+        val = cl->pf_handshake (cl);
+    while (val > 0);
 
     if (val == 0)
     {
         msg_Dbg (cl, "TLS client session initialized");
-        vlc_object_attach (cl, obj);
         return cl;
     }
     msg_Err (cl, "TLS client session handshake error");
 
-    module_Unneed (cl, cl->p_module);
-    vlc_object_destroy (cl);
+    module_unneed (cl, cl->p_module);
+    vlc_object_release (cl);
     return NULL;
 }
 
@@ -159,7 +221,6 @@ void tls_ClientDelete (tls_session_t *cl)
     if (cl == NULL)
         return;
 
-    module_Unneed (cl, cl->p_module);
-    vlc_object_detach (cl);
-    vlc_object_destroy (cl);
+    module_unneed (cl, cl->p_module);
+    vlc_object_release (cl);
 }