Changeset e2133869a6dd73b22775d826729b6033131d98f3

Timestamp:

05/04/08 13:33:19 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[ab95c5fa064411a759f64538b721c8443f5b733f]

git-author:

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

Message:

Factorize the gcrypt thread support

Files:

• include/vlc_gcrypt.h (added)
• modules/misc/gnutls.c (modified) (4 diffs)
• src/Makefile.am (modified) (1 diff)

modules/misc/gnutls.c

@@ -47 +47 @@
-
-
-"vlc_tls.h"
+<vlc_tls.h>
-#include <vlc_charset.h>
-
@@ -53 +53 @@
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+
+#include <vlc_gcrypt.h>
-
-#define CACHE_TIMEOUT     3600
@@ -102 +104 @@
-vlc_module_end();
-
-
-
-#ifdef LIBVLC_USE_PTHREAD
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-# define gcry_threads_vlc gcry_threads_pthread
-#else
-/**
- * gcrypt thread option VLC implementation
- */
-
-static int gcry_vlc_mutex_init( void **p_sys )
-{
-    int i_val;
-    vlc_mutex_t *p_lock = (vlc_mutex_t *)malloc( sizeof( vlc_mutex_t ) );
-
-    if( p_lock == NULL)
-        return ENOMEM;
-
-    i_val = vlc_mutex_init( p_lock );
-    if( i_val )
-        free( p_lock );
-    else
-        *p_sys = p_lock;
-    return i_val;
-}
-
-static int gcry_vlc_mutex_destroy( void **p_sys )
-{
-    vlc_mutex_t *p_lock = (vlc_mutex_t *)*p_sys;
-    vlc_mutex_destroy( p_lock );
-    free( p_lock );
-    return VLC_SUCCESS;
-}
-
-static int gcry_vlc_mutex_lock( void **p_sys )
-{
-    vlc_mutex_lock( (vlc_mutex_t *)*p_sys );
-    return VLC_SUCCESS;
-}
-
-static int gcry_vlc_mutex_unlock( void **lock )
-{
-    vlc_mutex_unlock( (vlc_mutex_t *)*lock );
-    return VLC_SUCCESS;
-}
-
-static struct gcry_thread_cbs gcry_threads_vlc =
-{
-    GCRY_THREAD_OPTION_USER,
-    NULL,
-    gcry_vlc_mutex_init,
-    gcry_vlc_mutex_destroy,
-    gcry_vlc_mutex_lock,
-    gcry_vlc_mutex_unlock
-};
-#endif
-
-
-/**
- * Initializes GnuTLS with proper locking.
@@ -168 +112 @@
-    int ret = VLC_EGENERIC;
-
+    vlc_gcrypt_init (); /* GnuTLS depends on gcrypt */
+
-    vlc_mutex_t *lock = var_AcquireMutex ("gnutls_mutex");
-
-    gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
-    if (gnutls_global_init ())
-    {

src/Makefile.am

@@ -74 +74 @@
-    ../include/vlc_filter.h \
-    ../include/vlc_fixups.h \
+    ../include/vlc_gcrypt.h \
-    ../include/vlc_httpd.h \
-    ../include/vlc_image.h \