use ssl macro to init on dingaling too

This commit is contained in:
Anthony Minessale committed 2011-05-13 16:17:17 -05:00
1 parent 45e964518f
commit 23b5f58202
6 files changed
+32 -58

No files matched your search

+5 -53
View File
@@ -28,61 +28,11 @@
*
*/
#ifndef __SWITCH_CURL_H
#define __SWITCH_CURL_H
#include <curl/curl.h>
#if defined(HAVE_OPENSSL)
#include <openssl/crypto.h>
static switch_mutex_t **ssl_mutexes;
static switch_memory_pool_t *ssl_pool = NULL;
static inline void switch_curl_ssl_lock_callback(int mode, int type, char *file, int line)
{
if (mode & CRYPTO_LOCK) {
switch_mutex_lock(ssl_mutexes[type]);
}
else {
switch_mutex_unlock(ssl_mutexes[type]);
}
}
static inline unsigned long switch_curl_ssl_thread_id(void)
{
return (unsigned long) switch_thread_self();
}
static inline void switch_curl_init_ssl_locks(void)
{
int i, num = CRYPTO_num_locks();
ssl_mutexes = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(switch_mutex_t*));
switch_assert(ssl_mutexes != NULL);
switch_core_new_memory_pool(&ssl_pool);
for (i = 0; i < num; i++) {
switch_mutex_init(&(ssl_mutexes[i]), SWITCH_MUTEX_NESTED, ssl_pool);
switch_assert(ssl_mutexes[i] != NULL);
}
CRYPTO_set_id_callback(switch_curl_ssl_thread_id);
CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_curl_ssl_lock_callback);
}
static inline void switch_curl_destroy_ssl_locks()
{
int i;
CRYPTO_set_locking_callback(NULL);
for (i = 0; i < CRYPTO_num_locks(); i++) {
switch_mutex_destroy(ssl_mutexes[i]);
}
OPENSSL_free(ssl_mutexes);
}
#endif
#include "switch_ssl.h"
static inline void switch_curl_init(void)
{
@@ -115,6 +65,8 @@ static inline void switch_curl_destroy()
switch_core_curl_count(&curl_count);
}
#endif
/* For Emacs:
* Local Variables: