diff options
author | wm4 <nfxjfg@googlemail.com> | 2015-05-26 19:25:42 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2015-05-26 21:48:51 +0300 |
commit | 57cde2b180fcec0eaf60aad65f436ab6420546f5 (patch) | |
tree | 8f11332b40ddf10dafd3b82a8fd2ac5141466c9f /libavformat/network.c | |
parent | d8ffb2055f0e0fcb5d025bab72eb19c2a886c125 (diff) |
lavf: move TLS-related ifdeffery to library specific files
There is no need to have this mess in network.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/network.c')
-rw-r--r-- | libavformat/network.c | 91 |
1 files changed, 9 insertions, 82 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index 6d308ebd01..a12e70dd04 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -20,102 +20,29 @@ #include <fcntl.h> #include "network.h" +#include "tls.h" #include "url.h" #include "libavcodec/internal.h" #include "libavutil/mem.h" -#if HAVE_THREADS -#if HAVE_PTHREADS -#include <pthread.h> -#else -#include "compat/w32pthreads.h" -#endif -#endif - -#if CONFIG_OPENSSL -#include <openssl/ssl.h> -static int openssl_init; -#if HAVE_THREADS -#include <openssl/crypto.h> -#include "libavutil/avutil.h" -pthread_mutex_t *openssl_mutexes; -static void openssl_lock(int mode, int type, const char *file, int line) -{ - if (mode & CRYPTO_LOCK) - pthread_mutex_lock(&openssl_mutexes[type]); - else - pthread_mutex_unlock(&openssl_mutexes[type]); -} -#if !defined(WIN32) && OPENSSL_VERSION_NUMBER < 0x10000000 -static unsigned long openssl_thread_id(void) -{ - return (intptr_t) pthread_self(); -} -#endif -#endif -#endif -#if CONFIG_GNUTLS -#include <gnutls/gnutls.h> -#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 -#include <gcrypt.h> -#include <errno.h> -GCRY_THREAD_OPTION_PTHREAD_IMPL; -#endif -#endif - void ff_tls_init(void) { - avpriv_lock_avformat(); -#if CONFIG_OPENSSL - if (!openssl_init) { - SSL_library_init(); - SSL_load_error_strings(); -#if HAVE_THREADS - if (!CRYPTO_get_locking_callback()) { - int i; - openssl_mutexes = av_malloc(sizeof(pthread_mutex_t) * CRYPTO_num_locks()); - for (i = 0; i < CRYPTO_num_locks(); i++) - pthread_mutex_init(&openssl_mutexes[i], NULL); - CRYPTO_set_locking_callback(openssl_lock); -#if !defined(WIN32) && OPENSSL_VERSION_NUMBER < 0x10000000 - CRYPTO_set_id_callback(openssl_thread_id); -#endif - } -#endif - } - openssl_init++; -#endif -#if CONFIG_GNUTLS -#if HAVE_THREADS && GNUTLS_VERSION_NUMBER < 0x020b00 - if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0) - gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +#if CONFIG_TLS_OPENSSL_PROTOCOL + ff_openssl_init(); #endif - gnutls_global_init(); +#if CONFIG_TLS_GNUTLS_PROTOCOL + ff_gnutls_init(); #endif - avpriv_unlock_avformat(); } void ff_tls_deinit(void) { - avpriv_lock_avformat(); -#if CONFIG_OPENSSL - openssl_init--; - if (!openssl_init) { -#if HAVE_THREADS - if (CRYPTO_get_locking_callback() == openssl_lock) { - int i; - CRYPTO_set_locking_callback(NULL); - for (i = 0; i < CRYPTO_num_locks(); i++) - pthread_mutex_destroy(&openssl_mutexes[i]); - av_free(openssl_mutexes); - } -#endif - } +#if CONFIG_TLS_OPENSSL_PROTOCOL + ff_openssl_deinit(); #endif -#if CONFIG_GNUTLS - gnutls_global_deinit(); +#if CONFIG_TLS_GNUTLS_PROTOCOL + ff_gnutls_deinit(); #endif - avpriv_unlock_avformat(); } int ff_network_inited_globally; |