[FFmpeg-devel] [PATCH 2/2] lavf: remove TLS related ifdeffery to library specific files
wm4
nfxjfg at googlemail.com
Fri May 22 15:54:06 CEST 2015
There is no need to have this mess in network.c.
---
libavformat/network.c | 83 +++--------------------------------------------
libavformat/tls_common.h | 6 ++++
libavformat/tls_gnutls.c | 26 +++++++++++++++
libavformat/tls_openssl.c | 64 ++++++++++++++++++++++++++++++++++++
4 files changed, 101 insertions(+), 78 deletions(-)
diff --git a/libavformat/network.c b/libavformat/network.c
index 6d308eb..0063399 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -20,102 +20,29 @@
#include <fcntl.h>
#include "network.h"
+#include "tls_common.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++;
+ ff_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);
-#endif
- gnutls_global_init();
+ 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
- }
+ ff_openssl_deinit();
#endif
#if CONFIG_GNUTLS
- gnutls_global_deinit();
+ ff_gnutls_deinit();
#endif
- avpriv_unlock_avformat();
}
int ff_network_inited_globally;
diff --git a/libavformat/tls_common.h b/libavformat/tls_common.h
index 31ae935..f5cb975 100644
--- a/libavformat/tls_common.h
+++ b/libavformat/tls_common.h
@@ -48,4 +48,10 @@ typedef struct TLSShared {
int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options);
+void ff_gnutls_init(void);
+void ff_gnutls_deinit(void);
+
+void ff_openssl_init(void);
+void ff_openssl_deinit(void);
+
#endif /* AVFORMAT_TLS_COMMON_H */
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index bfc9985..aaf752c 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <errno.h>
+
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
@@ -28,10 +30,16 @@
#include "os_support.h"
#include "url.h"
#include "tls_common.h"
+#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
+#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
+
typedef struct TLSContext {
const AVClass *class;
TLSShared tls_shared;
@@ -39,6 +47,24 @@ typedef struct TLSContext {
gnutls_certificate_credentials_t cred;
} TLSContext;
+void ff_gnutls_init(void)
+{
+ avpriv_lock_avformat();
+#if HAVE_THREADS && GNUTLS_VERSION_NUMBER < 0x020b00
+ if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0)
+ gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+ gnutls_global_init();
+ avpriv_unlock_avformat();
+}
+
+void ff_gnutls_deinit(void)
+{
+ avpriv_lock_avformat();
+ gnutls_global_deinit();
+ avpriv_unlock_avformat();
+}
+
static int print_tls_error(URLContext *h, int ret)
{
switch (ret) {
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index a881d9d..fa6d15b 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -25,14 +25,19 @@
#include "os_support.h"
#include "url.h"
#include "tls_common.h"
+#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
+#include "libavutil/avutil.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
+#include "libavutil/thread.h"
#include <openssl/bio.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
+static int openssl_init;
+
typedef struct TLSContext {
const AVClass *class;
TLSShared tls_shared;
@@ -40,6 +45,65 @@ typedef struct TLSContext {
SSL *ssl;
} TLSContext;
+#if HAVE_THREADS
+#include <openssl/crypto.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
+
+void ff_openssl_init(void)
+{
+ avpriv_lock_avformat();
+ 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++;
+ avpriv_unlock_avformat();
+}
+
+void ff_openssl_deinit(void)
+{
+ avpriv_lock_avformat();
+ 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
+ }
+ avpriv_unlock_avformat();
+}
+
static int print_tls_error(URLContext *h, int ret)
{
av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
--
2.1.4
More information about the ffmpeg-devel
mailing list